diff --git a/src/components/dashboard/commercial-chief/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/commercial-chief/Form/ConfirmForm/ConfirmContent.jsx index f68dd36..b424d8e 100644 --- a/src/components/dashboard/commercial-chief/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/commercial-chief/Form/ConfirmForm/ConfirmContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; import {CONFIRM_COMMERCIAL_CHIEF} from "@/core/data/apiRoutes"; import UploadFileNotification from "@/core/components/notifications/UploadFileNotification"; -import { useState } from "react"; +import {useState} from "react"; -const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { +const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => { const t = useTranslations(); const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); @@ -30,8 +30,8 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { requestServer(`${CONFIRM_COMMERCIAL_CHIEF}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) update_notification() + mutate() }).catch(() => { }).finally(() => { setSubmitting(false); @@ -63,7 +63,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { } }; - return( + return ( <> diff --git a/src/components/dashboard/commercial-chief/Form/ConfirmForm/index.jsx b/src/components/dashboard/commercial-chief/Form/ConfirmForm/index.jsx index 3683d82..95a6367 100644 --- a/src/components/dashboard/commercial-chief/Form/ConfirmForm/index.jsx +++ b/src/components/dashboard/commercial-chief/Form/ConfirmForm/index.jsx @@ -1,13 +1,13 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useTranslations } from "next-intl"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material"; +import {useTranslations} from "next-intl"; import ThumbUpAltIcon from "@mui/icons-material/ThumbUpAlt"; -import { useState } from "react"; +import {useState} from "react"; import ConfirmContent from "./ConfirmContent"; -const Confirm = ({rowId, fetchUrl, mutate}) => { +const Confirm = ({rowId, mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); - return( + return ( <> { {t("ConfirmDialog.confirm")} - + ) diff --git a/src/components/dashboard/commercial-chief/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/commercial-chief/Form/RejectForm/RejectContent.jsx index 98f3528..70dceab 100644 --- a/src/components/dashboard/commercial-chief/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/commercial-chief/Form/RejectForm/RejectContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem" import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; +import {useState} from "react"; import * as Yup from "yup"; import {REJECT_COMMERCIAL_CHIEF} from "@/core/data/apiRoutes"; -const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { +const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); const [fileName, setfileName] = useState(null); @@ -35,7 +35,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { requestServer(`${REJECT_COMMERCIAL_CHIEF}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -66,7 +66,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { setShowAddIcon(false); } }; - return( + return ( <> diff --git a/src/components/dashboard/commercial-chief/Form/RejectForm/index.jsx b/src/components/dashboard/commercial-chief/Form/RejectForm/index.jsx index 678a842..06608f5 100644 --- a/src/components/dashboard/commercial-chief/Form/RejectForm/index.jsx +++ b/src/components/dashboard/commercial-chief/Form/RejectForm/index.jsx @@ -1,10 +1,10 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material" -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material" +import {useTranslations} from "next-intl"; +import {useState} from "react"; import RejectContent from "./RejectContent"; import ThumbDownIcon from "@mui/icons-material/ThumbDown"; -const Reject = ({rowId, fetchUrl, mutate}) => { +const Reject = ({rowId, mutate}) => { const t = useTranslations(); const [openRejectDialog, setOpenRejectDialog] = useState(false); return ( @@ -17,7 +17,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => { {t("RejectDialog.reject")} - + ) diff --git a/src/components/dashboard/commercial-chief/TableRowActions.jsx b/src/components/dashboard/commercial-chief/TableRowActions.jsx index 498f1e4..36fb1e5 100644 --- a/src/components/dashboard/commercial-chief/TableRowActions.jsx +++ b/src/components/dashboard/commercial-chief/TableRowActions.jsx @@ -2,17 +2,15 @@ import {Box} from "@mui/material"; import Confirm from "./Form/ConfirmForm"; import Reject from "./Form/RejectForm"; -const TableRow = ({row, mutate, fetchUrl}) => { +const TableRow = ({row, mutate}) => { return ( diff --git a/src/components/dashboard/development-assistant/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/development-assistant/Form/ConfirmForm/ConfirmContent.jsx index b548620..75038ad 100644 --- a/src/components/dashboard/development-assistant/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/development-assistant/Form/ConfirmForm/ConfirmContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; import {CONFIRM_DEVELOPMENT_ASSISTANT} from "@/core/data/apiRoutes"; import UploadFileNotification from "@/core/components/notifications/UploadFileNotification"; -import { useState } from "react"; +import {useState} from "react"; -const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { +const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => { const t = useTranslations(); const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); @@ -30,7 +30,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { requestServer(`${CONFIRM_DEVELOPMENT_ASSISTANT}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -63,7 +63,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { } }; - return( + return ( <> diff --git a/src/components/dashboard/development-assistant/Form/ConfirmForm/index.jsx b/src/components/dashboard/development-assistant/Form/ConfirmForm/index.jsx index 3683d82..95a6367 100644 --- a/src/components/dashboard/development-assistant/Form/ConfirmForm/index.jsx +++ b/src/components/dashboard/development-assistant/Form/ConfirmForm/index.jsx @@ -1,13 +1,13 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useTranslations } from "next-intl"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material"; +import {useTranslations} from "next-intl"; import ThumbUpAltIcon from "@mui/icons-material/ThumbUpAlt"; -import { useState } from "react"; +import {useState} from "react"; import ConfirmContent from "./ConfirmContent"; -const Confirm = ({rowId, fetchUrl, mutate}) => { +const Confirm = ({rowId, mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); - return( + return ( <> { {t("ConfirmDialog.confirm")} - + ) diff --git a/src/components/dashboard/development-assistant/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/development-assistant/Form/RejectForm/RejectContent.jsx index 2b33cb2..f89a8f5 100644 --- a/src/components/dashboard/development-assistant/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/development-assistant/Form/RejectForm/RejectContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem" import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; +import {useState} from "react"; import * as Yup from "yup"; import {REJECT_DEVELOPMENT_ASSISTANT} from "@/core/data/apiRoutes"; -const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { +const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); const [fileName, setfileName] = useState(null); @@ -35,7 +35,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { requestServer(`${REJECT_DEVELOPMENT_ASSISTANT}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -66,7 +66,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { setShowAddIcon(false); } }; - return( + return ( <> diff --git a/src/components/dashboard/development-assistant/Form/RejectForm/index.jsx b/src/components/dashboard/development-assistant/Form/RejectForm/index.jsx index 678a842..06608f5 100644 --- a/src/components/dashboard/development-assistant/Form/RejectForm/index.jsx +++ b/src/components/dashboard/development-assistant/Form/RejectForm/index.jsx @@ -1,10 +1,10 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material" -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material" +import {useTranslations} from "next-intl"; +import {useState} from "react"; import RejectContent from "./RejectContent"; import ThumbDownIcon from "@mui/icons-material/ThumbDown"; -const Reject = ({rowId, fetchUrl, mutate}) => { +const Reject = ({rowId, mutate}) => { const t = useTranslations(); const [openRejectDialog, setOpenRejectDialog] = useState(false); return ( @@ -17,7 +17,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => { {t("RejectDialog.reject")} - + ) diff --git a/src/components/dashboard/development-assistant/TableRowActions.jsx b/src/components/dashboard/development-assistant/TableRowActions.jsx index 121d4e0..69f9d6f 100644 --- a/src/components/dashboard/development-assistant/TableRowActions.jsx +++ b/src/components/dashboard/development-assistant/TableRowActions.jsx @@ -2,18 +2,16 @@ import {Box} from "@mui/material"; import Confirm from "./Form/ConfirmForm"; import Reject from "./Form/RejectForm"; -const TableRow = ({row, mutate, fetchUrl}) => { +const TableRow = ({row, mutate}) => { return ( diff --git a/src/components/dashboard/expert-management/Form/ChangePassword/ChangePasswordContent.jsx b/src/components/dashboard/expert-management/Form/ChangePassword/ChangePasswordContent.jsx index b0a9157..3719b8a 100644 --- a/src/components/dashboard/expert-management/Form/ChangePassword/ChangePasswordContent.jsx +++ b/src/components/dashboard/expert-management/Form/ChangePassword/ChangePasswordContent.jsx @@ -8,7 +8,7 @@ import {useState} from "react"; import useRequest from "@/lib/app/hooks/useRequest"; -const ChnagePasswordContent = ({rowId, fetchUrl, mutate, setOpenChangePasswordDialog}) => { +const ChnagePasswordContent = ({rowId, mutate, setOpenChangePasswordDialog}) => { const t = useTranslations(); const requestServer = useRequest(); const [showPassword, setShowPassword] = useState(false); @@ -40,7 +40,7 @@ const ChnagePasswordContent = ({rowId, fetchUrl, mutate, setOpenChangePasswordDi data: formData }) .then((response) => { - mutate(fetchUrl) + mutate() }).catch(() => { }).finally(() => { setSubmitting(false); diff --git a/src/components/dashboard/expert-management/Form/ChangePassword/index.jsx b/src/components/dashboard/expert-management/Form/ChangePassword/index.jsx index 958d1c8..73b00fc 100644 --- a/src/components/dashboard/expert-management/Form/ChangePassword/index.jsx +++ b/src/components/dashboard/expert-management/Form/ChangePassword/index.jsx @@ -5,7 +5,7 @@ import {useState} from "react"; import ChangePasswordContent from "./ChangePasswordContent"; -const ChangePassword = ({rowId, fetchUrl, mutate}) => { +const ChangePassword = ({rowId, mutate}) => { const t = useTranslations(); const [openChnagePasswordDialog, setOpenChangePasswordDialog] = useState(false); @@ -24,7 +24,7 @@ const ChangePassword = ({rowId, fetchUrl, mutate}) => { {t("ExpertMangement.change_password")} - diff --git a/src/components/dashboard/expert-management/Form/CreateForm/CreateContent.jsx b/src/components/dashboard/expert-management/Form/CreateForm/CreateContent.jsx index 3757087..990421d 100644 --- a/src/components/dashboard/expert-management/Form/CreateForm/CreateContent.jsx +++ b/src/components/dashboard/expert-management/Form/CreateForm/CreateContent.jsx @@ -25,7 +25,7 @@ import useProvince from "@/lib/app/hooks/useProvince"; import useRole from "@/lib/app/hooks/useRole"; import {Visibility, VisibilityOff} from "@mui/icons-material"; -const CreateContent = ({setOpenCreateDialog, mutate, fetchUrl}) => { +const CreateContent = ({setOpenCreateDialog, mutate}) => { const t = useTranslations(); const requestServer = useRequest() const [cityList, setCityList] = useState([]); @@ -105,7 +105,7 @@ const CreateContent = ({setOpenCreateDialog, mutate, fetchUrl}) => { requestServer(`${CREATE_EXPERT_MANAGEMENT}`, 'post', {auth: true, data: formData}) .then((response) => { - mutate(fetchUrl) + mutate() setOpenCreateDialog(false) }).catch(() => { }).finally(() => { diff --git a/src/components/dashboard/expert-management/Form/CreateForm/index.jsx b/src/components/dashboard/expert-management/Form/CreateForm/index.jsx index 8556b11..b9a110b 100644 --- a/src/components/dashboard/expert-management/Form/CreateForm/index.jsx +++ b/src/components/dashboard/expert-management/Form/CreateForm/index.jsx @@ -4,7 +4,7 @@ import DataSaverOnIcon from "@mui/icons-material/DataSaverOn"; import {useState} from "react"; import CreateContent from "./CreateContent"; -const Create = ({mutate, fetchUrl}) => { +const Create = ({mutate}) => { const t = useTranslations(); const [openCreateDialog, setOpenCreateDialog] = useState(false); @@ -30,7 +30,7 @@ const Create = ({mutate, fetchUrl}) => { TransitionProps={{unmountOnExit: true}} PaperProps={{sx: {boxShadow: 'rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px'}}}> {t("ExpertMangement.create")} - + ); diff --git a/src/components/dashboard/expert-management/Form/DeleteForm.jsx b/src/components/dashboard/expert-management/Form/DeleteForm.jsx index 87a097c..3c8b5b7 100644 --- a/src/components/dashboard/expert-management/Form/DeleteForm.jsx +++ b/src/components/dashboard/expert-management/Form/DeleteForm.jsx @@ -14,7 +14,7 @@ import {DELETE_EXPERT_MANAGEMENT} from "@/core/data/apiRoutes"; import useRequest from "@/lib/app/hooks/useRequest"; import {useTranslations} from "next-intl"; -const Delete = ({rowId, fetchUrl, mutate}) => { +const Delete = ({rowId, mutate}) => { const t = useTranslations(); const requestServer = useRequest({auth: true}); const [openDeleteDialog, setOpenDeleteDialog] = useState(false); @@ -24,7 +24,7 @@ const Delete = ({rowId, fetchUrl, mutate}) => { setIsSubmitting(true) requestServer(`${DELETE_EXPERT_MANAGEMENT}/${rowId}`, 'post') .then((response) => { - mutate(fetchUrl) + mutate() }) .catch(() => { }) diff --git a/src/components/dashboard/expert-management/Form/UpdateForm/UpdateContent.jsx b/src/components/dashboard/expert-management/Form/UpdateForm/UpdateContent.jsx index a53a7c6..5725d43 100644 --- a/src/components/dashboard/expert-management/Form/UpdateForm/UpdateContent.jsx +++ b/src/components/dashboard/expert-management/Form/UpdateForm/UpdateContent.jsx @@ -22,7 +22,7 @@ import useRequest from "@/lib/app/hooks/useRequest"; import useProvince from "@/lib/app/hooks/useProvince"; import useRole from "@/lib/app/hooks/useRole"; -const UpdateContent = ({row, fetchUrl, mutate, setOpenUpdateDialog}) => { +const UpdateContent = ({row, mutate, setOpenUpdateDialog}) => { const t = useTranslations(); const requestServer = useRequest(); const [cityList, setCityList] = useState([]); @@ -89,7 +89,7 @@ const UpdateContent = ({row, fetchUrl, mutate, setOpenUpdateDialog}) => { requestServer(`${UPDATE_EXPERT_MANAGEMENT}/${row.original.id}`, 'post', {auth: true, data: formData}) .then((response) => { - mutate(fetchUrl) + mutate() }).catch(() => { }).finally(() => { setSubmitting(false); diff --git a/src/components/dashboard/expert-management/Form/UpdateForm/index.jsx b/src/components/dashboard/expert-management/Form/UpdateForm/index.jsx index ff20452..7197d1c 100644 --- a/src/components/dashboard/expert-management/Form/UpdateForm/index.jsx +++ b/src/components/dashboard/expert-management/Form/UpdateForm/index.jsx @@ -5,7 +5,7 @@ import {useState} from "react"; import UpdateContent from "./UpdateContent"; -const Update = ({row, fetchUrl, mutate}) => { +const Update = ({row, mutate}) => { const t = useTranslations(); const [openUpdateDialog, setOpenUpdateDialog] = useState(false); @@ -24,7 +24,7 @@ const Update = ({row, fetchUrl, mutate}) => { {t("ExpertMangement.update")} - + ); diff --git a/src/components/dashboard/expert-management/TableRowActions.jsx b/src/components/dashboard/expert-management/TableRowActions.jsx index b6976d3..1bf5968 100644 --- a/src/components/dashboard/expert-management/TableRowActions.jsx +++ b/src/components/dashboard/expert-management/TableRowActions.jsx @@ -3,23 +3,20 @@ import Update from "./Form/UpdateForm" import Delete from "./Form/DeleteForm"; import ChangePassword from "./Form/ChangePassword"; -const TableRowActions = ({row, mutate, fetchUrl}) => { +const TableRowActions = ({row, mutate}) => { return ( diff --git a/src/components/dashboard/inspector-expert/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/inspector-expert/Form/ConfirmForm/ConfirmContent.jsx index 195bdda..b284b6b 100644 --- a/src/components/dashboard/inspector-expert/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/inspector-expert/Form/ConfirmForm/ConfirmContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; import {CONFIRM_INSPECTOR_EXPERT} from "@/core/data/apiRoutes"; import UploadFileNotification from "@/core/components/notifications/UploadFileNotification"; -import { useState } from "react"; +import {useState} from "react"; -const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { +const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => { const t = useTranslations(); const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); @@ -30,7 +30,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { requestServer(`${CONFIRM_INSPECTOR_EXPERT}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -63,7 +63,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { } }; - return( + return ( <> diff --git a/src/components/dashboard/inspector-expert/Form/ConfirmForm/index.jsx b/src/components/dashboard/inspector-expert/Form/ConfirmForm/index.jsx index 3683d82..95a6367 100644 --- a/src/components/dashboard/inspector-expert/Form/ConfirmForm/index.jsx +++ b/src/components/dashboard/inspector-expert/Form/ConfirmForm/index.jsx @@ -1,13 +1,13 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useTranslations } from "next-intl"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material"; +import {useTranslations} from "next-intl"; import ThumbUpAltIcon from "@mui/icons-material/ThumbUpAlt"; -import { useState } from "react"; +import {useState} from "react"; import ConfirmContent from "./ConfirmContent"; -const Confirm = ({rowId, fetchUrl, mutate}) => { +const Confirm = ({rowId, mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); - return( + return ( <> { {t("ConfirmDialog.confirm")} - + ) diff --git a/src/components/dashboard/inspector-expert/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/inspector-expert/Form/RejectForm/RejectContent.jsx index 1055bab..cf535a1 100644 --- a/src/components/dashboard/inspector-expert/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/inspector-expert/Form/RejectForm/RejectContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem" import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; +import {useState} from "react"; import * as Yup from "yup"; import {REJECT_INSPECTOR_EXPERT} from "@/core/data/apiRoutes"; -const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { +const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); const [fileName, setfileName] = useState(null); @@ -35,7 +35,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { requestServer(`${REJECT_INSPECTOR_EXPERT}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -66,7 +66,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { setShowAddIcon(false); } }; - return( + return ( <> diff --git a/src/components/dashboard/inspector-expert/Form/RejectForm/index.jsx b/src/components/dashboard/inspector-expert/Form/RejectForm/index.jsx index 678a842..06608f5 100644 --- a/src/components/dashboard/inspector-expert/Form/RejectForm/index.jsx +++ b/src/components/dashboard/inspector-expert/Form/RejectForm/index.jsx @@ -1,10 +1,10 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material" -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material" +import {useTranslations} from "next-intl"; +import {useState} from "react"; import RejectContent from "./RejectContent"; import ThumbDownIcon from "@mui/icons-material/ThumbDown"; -const Reject = ({rowId, fetchUrl, mutate}) => { +const Reject = ({rowId, mutate}) => { const t = useTranslations(); const [openRejectDialog, setOpenRejectDialog] = useState(false); return ( @@ -17,7 +17,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => { {t("RejectDialog.reject")} - + ) diff --git a/src/components/dashboard/inspector-expert/Form/ReviseForm/ReviseContent.jsx b/src/components/dashboard/inspector-expert/Form/ReviseForm/ReviseContent.jsx index 0322572..90432bc 100644 --- a/src/components/dashboard/inspector-expert/Form/ReviseForm/ReviseContent.jsx +++ b/src/components/dashboard/inspector-expert/Form/ReviseForm/ReviseContent.jsx @@ -1,12 +1,12 @@ import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; +import {Button, DialogActions, DialogContent, Stack, TextField} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; import * as Yup from "yup"; import {REVISE_INSPECTOR_EXPERT} from "@/core/data/apiRoutes"; -const ReviseContent = ({rowId, fetchUrl, mutate, setOpenReviseDialog}) => { +const ReviseContent = ({rowId, mutate, setOpenReviseDialog}) => { const t = useTranslations(); const requestServer = useRequest({auth: true}) const {update_notification} = useNotification() @@ -27,7 +27,7 @@ const ReviseContent = ({rowId, fetchUrl, mutate, setOpenReviseDialog}) => { requestServer(`${REVISE_INSPECTOR_EXPERT}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -40,7 +40,7 @@ const ReviseContent = ({rowId, fetchUrl, mutate, setOpenReviseDialog}) => { formik.setFieldValue("description", event.target.value); formik.handleChange(event); }; - return( + return ( <> diff --git a/src/components/dashboard/inspector-expert/Form/ReviseForm/index.jsx b/src/components/dashboard/inspector-expert/Form/ReviseForm/index.jsx index 32ed64a..6b6691b 100644 --- a/src/components/dashboard/inspector-expert/Form/ReviseForm/index.jsx +++ b/src/components/dashboard/inspector-expert/Form/ReviseForm/index.jsx @@ -1,13 +1,13 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useTranslations } from "next-intl"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material"; +import {useTranslations} from "next-intl"; import ReplyIcon from '@mui/icons-material/Reply'; -import { useState } from "react"; +import {useState} from "react"; import ReviseContent from "./ReviseContent"; -const Revise = ({rowId, fetchUrl, mutate}) => { +const Revise = ({rowId, mutate}) => { const t = useTranslations(); const [openReviseDialog, setOpenReviseDialog] = useState(false); - return( + return ( <> { {t("ReviseDialog.revise")} - + ) diff --git a/src/components/dashboard/inspector-expert/TableRowActions.jsx b/src/components/dashboard/inspector-expert/TableRowActions.jsx index 577ad28..1d7f15d 100644 --- a/src/components/dashboard/inspector-expert/TableRowActions.jsx +++ b/src/components/dashboard/inspector-expert/TableRowActions.jsx @@ -3,23 +3,20 @@ import Confirm from "./Form/ConfirmForm"; import Reject from "./Form/RejectForm"; import Revise from "./Form/ReviseForm"; -const TableRow = ({row, mutate, fetchUrl}) => { +const TableRow = ({row, mutate}) => { return ( diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx index 00d8c2f..31c4201 100644 --- a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx @@ -1,16 +1,16 @@ import UploadSystem from "@/core/components/UploadSystem"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; import {CONFIRM_MACHINARY_OFFICE} from "@/core/data/apiRoutes"; import UploadFileNotification from "@/core/components/notifications/UploadFileNotification"; -import { useState } from "react"; +import {useState} from "react"; import PriceField from "@/core/components/PriceField"; import * as Yup from "yup"; -const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { +const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => { const t = useTranslations(); const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); @@ -33,7 +33,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { description: "", proposed_amount: "", confirm_img: null - },validationSchema, + }, validationSchema, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); formData.append("proposed_amount", values.proposed_amount); @@ -43,7 +43,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { requestServer(`${CONFIRM_MACHINARY_OFFICE}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -83,7 +83,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { } }; - return( + return ( <> @@ -102,31 +102,31 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { /> - - {t("ConfirmDialog.proposed_amount")}{t("ConfirmDialog.unit")}} - type="text" - inputProps={{ - inputMode: "number", - min: 0, - pattern: "[0-9]*", - }} - variant="outlined" - value={formik.values.proposed_amount} - onChange={handleAmountChange} - onBlur={formik.handleBlur("proposed_amount")} - error={ - formik.touched.proposed_amount && - Boolean(formik.errors.proposed_amount) - } - helperText={ - formik.touched.proposed_amount && formik.errors.proposed_amount - } - sx={{mt: 1}} - fullWidth - /> - + + {t("ConfirmDialog.proposed_amount")}{t("ConfirmDialog.unit")}} + type="text" + inputProps={{ + inputMode: "number", + min: 0, + pattern: "[0-9]*", + }} + variant="outlined" + value={formik.values.proposed_amount} + onChange={handleAmountChange} + onBlur={formik.handleBlur("proposed_amount")} + error={ + formik.touched.proposed_amount && + Boolean(formik.errors.proposed_amount) + } + helperText={ + formik.touched.proposed_amount && formik.errors.proposed_amount + } + sx={{mt: 1}} + fullWidth + /> + {t("UploadSystem.upload_file")}{t("UploadSystem.optional")} { +const Confirm = ({rowId, mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); - return( + return ( <> { {t("ConfirmDialog.confirm")} - + ) diff --git a/src/components/dashboard/machinary-office/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/machinary-office/Form/RejectForm/RejectContent.jsx index 1055bab..cf535a1 100644 --- a/src/components/dashboard/machinary-office/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/machinary-office/Form/RejectForm/RejectContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem" import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; +import {useState} from "react"; import * as Yup from "yup"; import {REJECT_INSPECTOR_EXPERT} from "@/core/data/apiRoutes"; -const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { +const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); const [fileName, setfileName] = useState(null); @@ -35,7 +35,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { requestServer(`${REJECT_INSPECTOR_EXPERT}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -66,7 +66,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { setShowAddIcon(false); } }; - return( + return ( <> diff --git a/src/components/dashboard/machinary-office/Form/RejectForm/index.jsx b/src/components/dashboard/machinary-office/Form/RejectForm/index.jsx index 678a842..06608f5 100644 --- a/src/components/dashboard/machinary-office/Form/RejectForm/index.jsx +++ b/src/components/dashboard/machinary-office/Form/RejectForm/index.jsx @@ -1,10 +1,10 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material" -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material" +import {useTranslations} from "next-intl"; +import {useState} from "react"; import RejectContent from "./RejectContent"; import ThumbDownIcon from "@mui/icons-material/ThumbDown"; -const Reject = ({rowId, fetchUrl, mutate}) => { +const Reject = ({rowId, mutate}) => { const t = useTranslations(); const [openRejectDialog, setOpenRejectDialog] = useState(false); return ( @@ -17,7 +17,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => { {t("RejectDialog.reject")} - + ) diff --git a/src/components/dashboard/machinary-office/TableRowActions.jsx b/src/components/dashboard/machinary-office/TableRowActions.jsx index 121d4e0..69f9d6f 100644 --- a/src/components/dashboard/machinary-office/TableRowActions.jsx +++ b/src/components/dashboard/machinary-office/TableRowActions.jsx @@ -2,18 +2,16 @@ import {Box} from "@mui/material"; import Confirm from "./Form/ConfirmForm"; import Reject from "./Form/RejectForm"; -const TableRow = ({row, mutate, fetchUrl}) => { +const TableRow = ({row, mutate}) => { return ( diff --git a/src/components/dashboard/navgan-loan-management/Form/UpdateForm/UpdateContent.jsx b/src/components/dashboard/navgan-loan-management/Form/UpdateForm/UpdateContent.jsx index f3ee9c5..b9bff45 100644 --- a/src/components/dashboard/navgan-loan-management/Form/UpdateForm/UpdateContent.jsx +++ b/src/components/dashboard/navgan-loan-management/Form/UpdateForm/UpdateContent.jsx @@ -1,13 +1,24 @@ -import { UPDATE_LOAN_MANAGEMENT_NAVGAN } from "@/core/data/apiRoutes"; +import {UPDATE_LOAN_MANAGEMENT_NAVGAN} from "@/core/data/apiRoutes"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; import useLoanStateNavgan from "@/lib/prefetchDataTable/hooks/useLoanStateNavgan"; -import { Button, DialogActions, DialogContent, FormControl, FormHelperText, InputLabel, MenuItem, Select, Stack, TextField } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; +import { + Button, + DialogActions, + DialogContent, + FormControl, + FormHelperText, + InputLabel, + MenuItem, + Select, + Stack, + TextField +} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; import * as Yup from "yup"; -const UpdateContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { +const UpdateContent = ({rowId, mutate, setOpenConfirmDialog}) => { const t = useTranslations(); const {loan_state_navgan} = useLoanStateNavgan() const requestServer = useRequest({auth: true}) @@ -32,7 +43,7 @@ const UpdateContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { requestServer(`${UPDATE_LOAN_MANAGEMENT_NAVGAN}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -47,7 +58,7 @@ const UpdateContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { const handleNextStateIDChange = (event) => { formik.setFieldValue("next_state_id", event.target.value) }; - return( + return ( <> diff --git a/src/components/dashboard/navgan-loan-management/Form/UpdateForm/index.jsx b/src/components/dashboard/navgan-loan-management/Form/UpdateForm/index.jsx index 66e7521..321a709 100644 --- a/src/components/dashboard/navgan-loan-management/Form/UpdateForm/index.jsx +++ b/src/components/dashboard/navgan-loan-management/Form/UpdateForm/index.jsx @@ -1,10 +1,10 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useTranslations } from "next-intl"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material"; +import {useTranslations} from "next-intl"; import ChangeCircleIcon from '@mui/icons-material/ChangeCircle'; -import { useState } from "react"; +import {useState} from "react"; import UpdateContent from "./UpdateContent"; -const Update = ({rowId, fetchUrl, mutate}) => { +const Update = ({rowId, mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); return ( @@ -22,7 +22,7 @@ const Update = ({rowId, fetchUrl, mutate}) => { {t("UpdateDialog.update")} - + ) diff --git a/src/components/dashboard/navgan-loan-management/TableRowActions.jsx b/src/components/dashboard/navgan-loan-management/TableRowActions.jsx index fd599f9..a9d524c 100644 --- a/src/components/dashboard/navgan-loan-management/TableRowActions.jsx +++ b/src/components/dashboard/navgan-loan-management/TableRowActions.jsx @@ -1,14 +1,13 @@ import {Box} from "@mui/material"; import Update from "./Form/UpdateForm" -const TableRowActions = ({row, mutate, fetchUrl}) => { +const TableRowActions = ({row, mutate}) => { return ( ); diff --git a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx index cb67d3f..d9460d5 100644 --- a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; import {CONFIRM_NAVGAN_PROVINCE_MANAGER} from "@/core/data/apiRoutes"; import UploadFileNotification from "@/core/components/notifications/UploadFileNotification"; -import { useState } from "react"; +import {useState} from "react"; -const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { +const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => { const t = useTranslations(); const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); @@ -30,7 +30,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { requestServer(`${CONFIRM_NAVGAN_PROVINCE_MANAGER}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -63,7 +63,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { } }; - return( + return ( <> diff --git a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/index.jsx b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/index.jsx index 3683d82..95a6367 100644 --- a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/index.jsx +++ b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/index.jsx @@ -1,13 +1,13 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useTranslations } from "next-intl"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material"; +import {useTranslations} from "next-intl"; import ThumbUpAltIcon from "@mui/icons-material/ThumbUpAlt"; -import { useState } from "react"; +import {useState} from "react"; import ConfirmContent from "./ConfirmContent"; -const Confirm = ({rowId, fetchUrl, mutate}) => { +const Confirm = ({rowId, mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); - return( + return ( <> { {t("ConfirmDialog.confirm")} - + ) diff --git a/src/components/dashboard/navgan-province-manager/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/navgan-province-manager/Form/RejectForm/RejectContent.jsx index dd420b2..298d02b 100644 --- a/src/components/dashboard/navgan-province-manager/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/navgan-province-manager/Form/RejectForm/RejectContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem" import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; +import {useState} from "react"; import * as Yup from "yup"; import {REJECT_NAVGAN_PROVINCE_MANAGER} from "@/core/data/apiRoutes"; -const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { +const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); const [fileName, setfileName] = useState(null); @@ -35,7 +35,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { requestServer(`${REJECT_NAVGAN_PROVINCE_MANAGER}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -66,7 +66,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { setShowAddIcon(false); } }; - return( + return ( <> diff --git a/src/components/dashboard/navgan-province-manager/Form/RejectForm/index.jsx b/src/components/dashboard/navgan-province-manager/Form/RejectForm/index.jsx index 678a842..06608f5 100644 --- a/src/components/dashboard/navgan-province-manager/Form/RejectForm/index.jsx +++ b/src/components/dashboard/navgan-province-manager/Form/RejectForm/index.jsx @@ -1,10 +1,10 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material" -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material" +import {useTranslations} from "next-intl"; +import {useState} from "react"; import RejectContent from "./RejectContent"; import ThumbDownIcon from "@mui/icons-material/ThumbDown"; -const Reject = ({rowId, fetchUrl, mutate}) => { +const Reject = ({rowId, mutate}) => { const t = useTranslations(); const [openRejectDialog, setOpenRejectDialog] = useState(false); return ( @@ -17,7 +17,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => { {t("RejectDialog.reject")} - + ) diff --git a/src/components/dashboard/navgan-province-manager/TableRowActions.jsx b/src/components/dashboard/navgan-province-manager/TableRowActions.jsx index 121d4e0..69f9d6f 100644 --- a/src/components/dashboard/navgan-province-manager/TableRowActions.jsx +++ b/src/components/dashboard/navgan-province-manager/TableRowActions.jsx @@ -2,18 +2,16 @@ import {Box} from "@mui/material"; import Confirm from "./Form/ConfirmForm"; import Reject from "./Form/RejectForm"; -const TableRow = ({row, mutate, fetchUrl}) => { +const TableRow = ({row, mutate}) => { return ( diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx index 6c229e0..4fadae8 100644 --- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx @@ -1,16 +1,16 @@ import UploadSystem from "@/core/components/UploadSystem"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; import {CONFIRM_PASSENGER_BOSS} from "@/core/data/apiRoutes"; import UploadFileNotification from "@/core/components/notifications/UploadFileNotification"; -import { useState } from "react"; +import {useState} from "react"; import PriceField from "@/core/components/PriceField"; import * as Yup from "yup"; -const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { +const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => { const t = useTranslations(); const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); @@ -33,7 +33,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { description: "", approved_amount: "", confirm_img: null - },validationSchema, + }, validationSchema, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); formData.append("approved_amount", values.approved_amount); @@ -43,7 +43,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { requestServer(`${CONFIRM_PASSENGER_BOSS}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -83,7 +83,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { } }; - return( + return ( <> @@ -102,31 +102,31 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { /> - - {t("ConfirmDialog.approved_amount")}{t("ConfirmDialog.unit")}} - type="text" - inputProps={{ - inputMode: "number", - min: 0, - pattern: "[0-9]*", - }} - variant="outlined" - value={formik.values.approved_amount} - onChange={handleAmountChange} - onBlur={formik.handleBlur("approved_amount")} - error={ - formik.touched.approved_amount && - Boolean(formik.errors.approved_amount) - } - helperText={ - formik.touched.approved_amount && formik.errors.approved_amount - } - sx={{mt: 1}} - fullWidth - /> - + + {t("ConfirmDialog.approved_amount")}{t("ConfirmDialog.unit")}} + type="text" + inputProps={{ + inputMode: "number", + min: 0, + pattern: "[0-9]*", + }} + variant="outlined" + value={formik.values.approved_amount} + onChange={handleAmountChange} + onBlur={formik.handleBlur("approved_amount")} + error={ + formik.touched.approved_amount && + Boolean(formik.errors.approved_amount) + } + helperText={ + formik.touched.approved_amount && formik.errors.approved_amount + } + sx={{mt: 1}} + fullWidth + /> + {t("UploadSystem.upload_file")}{t("UploadSystem.optional")} { +const Confirm = ({rowId, mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); - return( + return ( <> { {t("ConfirmDialog.confirm")} - + ) diff --git a/src/components/dashboard/passenger-boss/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/passenger-boss/Form/RejectForm/RejectContent.jsx index 3583903..beb25de 100644 --- a/src/components/dashboard/passenger-boss/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/passenger-boss/Form/RejectForm/RejectContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem" import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; +import {useState} from "react"; import * as Yup from "yup"; import {REJECT_PASSENGER_BOSS} from "@/core/data/apiRoutes"; -const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { +const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); const [fileName, setfileName] = useState(null); @@ -35,7 +35,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { requestServer(`${REJECT_PASSENGER_BOSS}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -66,7 +66,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { setShowAddIcon(false); } }; - return( + return ( <> diff --git a/src/components/dashboard/passenger-boss/Form/RejectForm/index.jsx b/src/components/dashboard/passenger-boss/Form/RejectForm/index.jsx index 678a842..06608f5 100644 --- a/src/components/dashboard/passenger-boss/Form/RejectForm/index.jsx +++ b/src/components/dashboard/passenger-boss/Form/RejectForm/index.jsx @@ -1,10 +1,10 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material" -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material" +import {useTranslations} from "next-intl"; +import {useState} from "react"; import RejectContent from "./RejectContent"; import ThumbDownIcon from "@mui/icons-material/ThumbDown"; -const Reject = ({rowId, fetchUrl, mutate}) => { +const Reject = ({rowId, mutate}) => { const t = useTranslations(); const [openRejectDialog, setOpenRejectDialog] = useState(false); return ( @@ -17,7 +17,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => { {t("RejectDialog.reject")} - + ) diff --git a/src/components/dashboard/passenger-boss/TableRowActions.jsx b/src/components/dashboard/passenger-boss/TableRowActions.jsx index c22cf80..d10e248 100644 --- a/src/components/dashboard/passenger-boss/TableRowActions.jsx +++ b/src/components/dashboard/passenger-boss/TableRowActions.jsx @@ -1,20 +1,17 @@ import {Box} from "@mui/material"; -import RejectForm from "./Form/RejectForm" +import Reject from "./Form/RejectForm" import Confirm from "./Form/ConfirmForm"; -import Reject from "./Form/RejectForm"; -const TableRow = ({row, mutate, fetchUrl}) => { +const TableRow = ({row, mutate}) => { return ( diff --git a/src/components/dashboard/passenger-office/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-office/Form/ConfirmForm/ConfirmContent.jsx index 09c5d4e..e35de65 100644 --- a/src/components/dashboard/passenger-office/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/passenger-office/Form/ConfirmForm/ConfirmContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; import {CONFIRM_PASSENGER_OFFICE} from "@/core/data/apiRoutes"; import UploadFileNotification from "@/core/components/notifications/UploadFileNotification"; -import { useState } from "react"; +import {useState} from "react"; -const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { +const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => { const t = useTranslations(); const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); @@ -30,7 +30,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { requestServer(`${CONFIRM_PASSENGER_OFFICE}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -63,7 +63,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { } }; - return( + return ( <> diff --git a/src/components/dashboard/passenger-office/Form/ConfirmForm/index.jsx b/src/components/dashboard/passenger-office/Form/ConfirmForm/index.jsx index 3683d82..95a6367 100644 --- a/src/components/dashboard/passenger-office/Form/ConfirmForm/index.jsx +++ b/src/components/dashboard/passenger-office/Form/ConfirmForm/index.jsx @@ -1,13 +1,13 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useTranslations } from "next-intl"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material"; +import {useTranslations} from "next-intl"; import ThumbUpAltIcon from "@mui/icons-material/ThumbUpAlt"; -import { useState } from "react"; +import {useState} from "react"; import ConfirmContent from "./ConfirmContent"; -const Confirm = ({rowId, fetchUrl, mutate}) => { +const Confirm = ({rowId, mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); - return( + return ( <> { {t("ConfirmDialog.confirm")} - + ) diff --git a/src/components/dashboard/passenger-office/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/passenger-office/Form/RejectForm/RejectContent.jsx index cf4879e..d1f4d2d 100644 --- a/src/components/dashboard/passenger-office/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/passenger-office/Form/RejectForm/RejectContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem" import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; +import {useState} from "react"; import * as Yup from "yup"; import {REJECT_PASSENGER_OFFICE} from "@/core/data/apiRoutes"; -const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { +const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); const [fileName, setfileName] = useState(null); @@ -35,7 +35,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { requestServer(`${REJECT_PASSENGER_OFFICE}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -66,7 +66,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { setShowAddIcon(false); } }; - return( + return ( <> diff --git a/src/components/dashboard/passenger-office/Form/RejectForm/index.jsx b/src/components/dashboard/passenger-office/Form/RejectForm/index.jsx index 678a842..06608f5 100644 --- a/src/components/dashboard/passenger-office/Form/RejectForm/index.jsx +++ b/src/components/dashboard/passenger-office/Form/RejectForm/index.jsx @@ -1,10 +1,10 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material" -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material" +import {useTranslations} from "next-intl"; +import {useState} from "react"; import RejectContent from "./RejectContent"; import ThumbDownIcon from "@mui/icons-material/ThumbDown"; -const Reject = ({rowId, fetchUrl, mutate}) => { +const Reject = ({rowId, mutate}) => { const t = useTranslations(); const [openRejectDialog, setOpenRejectDialog] = useState(false); return ( @@ -17,7 +17,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => { {t("RejectDialog.reject")} - + ) diff --git a/src/components/dashboard/passenger-office/TableRowActions.jsx b/src/components/dashboard/passenger-office/TableRowActions.jsx index 121d4e0..985dd67 100644 --- a/src/components/dashboard/passenger-office/TableRowActions.jsx +++ b/src/components/dashboard/passenger-office/TableRowActions.jsx @@ -9,11 +9,9 @@ const TableRow = ({row, mutate, fetchUrl}) => { diff --git a/src/components/dashboard/province-head-expert/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/province-head-expert/Form/ConfirmForm/ConfirmContent.jsx index a095a89..4582da4 100644 --- a/src/components/dashboard/province-head-expert/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/province-head-expert/Form/ConfirmForm/ConfirmContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; import {CONFIRM_PROVINCE_HEAD_EXPERT} from "@/core/data/apiRoutes"; import UploadFileNotification from "@/core/components/notifications/UploadFileNotification"; -import { useState } from "react"; +import {useState} from "react"; -const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { +const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => { const t = useTranslations(); const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); @@ -30,7 +30,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { requestServer(`${CONFIRM_PROVINCE_HEAD_EXPERT}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -63,7 +63,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { } }; - return( + return ( <> diff --git a/src/components/dashboard/province-head-expert/Form/ConfirmForm/index.jsx b/src/components/dashboard/province-head-expert/Form/ConfirmForm/index.jsx index 3683d82..95a6367 100644 --- a/src/components/dashboard/province-head-expert/Form/ConfirmForm/index.jsx +++ b/src/components/dashboard/province-head-expert/Form/ConfirmForm/index.jsx @@ -1,13 +1,13 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useTranslations } from "next-intl"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material"; +import {useTranslations} from "next-intl"; import ThumbUpAltIcon from "@mui/icons-material/ThumbUpAlt"; -import { useState } from "react"; +import {useState} from "react"; import ConfirmContent from "./ConfirmContent"; -const Confirm = ({rowId, fetchUrl, mutate}) => { +const Confirm = ({rowId, mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); - return( + return ( <> { {t("ConfirmDialog.confirm")} - + ) diff --git a/src/components/dashboard/province-head-expert/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/province-head-expert/Form/RejectForm/RejectContent.jsx index 6bf7ed0..8cb358f 100644 --- a/src/components/dashboard/province-head-expert/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/province-head-expert/Form/RejectForm/RejectContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem" import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; +import {useState} from "react"; import * as Yup from "yup"; import {REJECT_PROVINCE_HEAD_EXPERT} from "@/core/data/apiRoutes"; -const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { +const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); const [fileName, setfileName] = useState(null); @@ -35,7 +35,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { requestServer(`${REJECT_PROVINCE_HEAD_EXPERT}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -66,7 +66,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { setShowAddIcon(false); } }; - return( + return ( <> diff --git a/src/components/dashboard/province-head-expert/Form/RejectForm/index.jsx b/src/components/dashboard/province-head-expert/Form/RejectForm/index.jsx index 678a842..06608f5 100644 --- a/src/components/dashboard/province-head-expert/Form/RejectForm/index.jsx +++ b/src/components/dashboard/province-head-expert/Form/RejectForm/index.jsx @@ -1,10 +1,10 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material" -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material" +import {useTranslations} from "next-intl"; +import {useState} from "react"; import RejectContent from "./RejectContent"; import ThumbDownIcon from "@mui/icons-material/ThumbDown"; -const Reject = ({rowId, fetchUrl, mutate}) => { +const Reject = ({rowId, mutate}) => { const t = useTranslations(); const [openRejectDialog, setOpenRejectDialog] = useState(false); return ( @@ -17,7 +17,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => { {t("RejectDialog.reject")} - + ) diff --git a/src/components/dashboard/province-head-expert/Form/ReviseForm/ReviseContent.jsx b/src/components/dashboard/province-head-expert/Form/ReviseForm/ReviseContent.jsx index 9775d24..0272bc4 100644 --- a/src/components/dashboard/province-head-expert/Form/ReviseForm/ReviseContent.jsx +++ b/src/components/dashboard/province-head-expert/Form/ReviseForm/ReviseContent.jsx @@ -1,12 +1,12 @@ import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; +import {Button, DialogActions, DialogContent, Stack, TextField} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; import * as Yup from "yup"; import {REVISE_PROVINCE_HEAD_EXPERT} from "@/core/data/apiRoutes"; -const ReviseContent = ({rowId, fetchUrl, mutate, setOpenReviseDialog}) => { +const ReviseContent = ({rowId, mutate, setOpenReviseDialog}) => { const t = useTranslations(); const requestServer = useRequest({auth: true}) const {update_notification} = useNotification() @@ -27,7 +27,7 @@ const ReviseContent = ({rowId, fetchUrl, mutate, setOpenReviseDialog}) => { requestServer(`${REVISE_PROVINCE_HEAD_EXPERT}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -40,7 +40,7 @@ const ReviseContent = ({rowId, fetchUrl, mutate, setOpenReviseDialog}) => { formik.setFieldValue("description", event.target.value); formik.handleChange(event); }; - return( + return ( <> diff --git a/src/components/dashboard/province-head-expert/Form/ReviseForm/index.jsx b/src/components/dashboard/province-head-expert/Form/ReviseForm/index.jsx index 32ed64a..6b6691b 100644 --- a/src/components/dashboard/province-head-expert/Form/ReviseForm/index.jsx +++ b/src/components/dashboard/province-head-expert/Form/ReviseForm/index.jsx @@ -1,13 +1,13 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useTranslations } from "next-intl"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material"; +import {useTranslations} from "next-intl"; import ReplyIcon from '@mui/icons-material/Reply'; -import { useState } from "react"; +import {useState} from "react"; import ReviseContent from "./ReviseContent"; -const Revise = ({rowId, fetchUrl, mutate}) => { +const Revise = ({rowId, mutate}) => { const t = useTranslations(); const [openReviseDialog, setOpenReviseDialog] = useState(false); - return( + return ( <> { {t("ReviseDialog.revise")} - + ) diff --git a/src/components/dashboard/province-head-expert/TableRowActions.jsx b/src/components/dashboard/province-head-expert/TableRowActions.jsx index 2ae3d42..e631ffc 100644 --- a/src/components/dashboard/province-head-expert/TableRowActions.jsx +++ b/src/components/dashboard/province-head-expert/TableRowActions.jsx @@ -3,23 +3,20 @@ import Confirm from "./Form/ConfirmForm"; import Reject from "./Form/RejectForm"; import Revise from "./Form/ReviseForm"; -const TableRowActions = ({row, mutate, fetchUrl}) => { +const TableRowActions = ({row, mutate}) => { return ( diff --git a/src/components/dashboard/refahi-loan-management/Form/UpdateForm/UpdateContent.jsx b/src/components/dashboard/refahi-loan-management/Form/UpdateForm/UpdateContent.jsx index 7dc79bf..a388be8 100644 --- a/src/components/dashboard/refahi-loan-management/Form/UpdateForm/UpdateContent.jsx +++ b/src/components/dashboard/refahi-loan-management/Form/UpdateForm/UpdateContent.jsx @@ -2,12 +2,23 @@ import {UPDATE_LOAN_MANAGEMENT_REFAHI} from "@/core/data/apiRoutes"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; import useLoanStateRefahi from "@/lib/prefetchDataTable/hooks/useLoanStateRefahi"; -import { Button, DialogActions, DialogContent, FormControl, FormHelperText, InputLabel, MenuItem, Select, Stack, TextField } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; +import { + Button, + DialogActions, + DialogContent, + FormControl, + FormHelperText, + InputLabel, + MenuItem, + Select, + Stack, + TextField +} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; import * as Yup from "yup"; -const UpdateContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { +const UpdateContent = ({rowId, mutate, setOpenConfirmDialog}) => { const t = useTranslations(); const {loan_state_refahi} = useLoanStateRefahi() const requestServer = useRequest({auth: true}) @@ -32,7 +43,7 @@ const UpdateContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { requestServer(`${UPDATE_LOAN_MANAGEMENT_REFAHI}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -47,7 +58,7 @@ const UpdateContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { const handleNextStateIDChange = (event) => { formik.setFieldValue("next_state_id", event.target.value) }; - return( + return ( <> @@ -84,7 +95,7 @@ const UpdateContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { onChange={handleNextStateIDChange} onBlur={formik.handleBlur("next_state_id")} > - {loan_state_refahi ? (loan_state_refahi.map((item) => { + {loan_state_refahi ? (loan_state_refahi.map((item) => { return ( {item.name} ) diff --git a/src/components/dashboard/refahi-loan-management/Form/UpdateForm/index.jsx b/src/components/dashboard/refahi-loan-management/Form/UpdateForm/index.jsx index 66e7521..321a709 100644 --- a/src/components/dashboard/refahi-loan-management/Form/UpdateForm/index.jsx +++ b/src/components/dashboard/refahi-loan-management/Form/UpdateForm/index.jsx @@ -1,10 +1,10 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useTranslations } from "next-intl"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material"; +import {useTranslations} from "next-intl"; import ChangeCircleIcon from '@mui/icons-material/ChangeCircle'; -import { useState } from "react"; +import {useState} from "react"; import UpdateContent from "./UpdateContent"; -const Update = ({rowId, fetchUrl, mutate}) => { +const Update = ({rowId, mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); return ( @@ -22,7 +22,7 @@ const Update = ({rowId, fetchUrl, mutate}) => { {t("UpdateDialog.update")} - + ) diff --git a/src/components/dashboard/refahi-loan-management/TableRowActions.jsx b/src/components/dashboard/refahi-loan-management/TableRowActions.jsx index 0604922..478cbb3 100644 --- a/src/components/dashboard/refahi-loan-management/TableRowActions.jsx +++ b/src/components/dashboard/refahi-loan-management/TableRowActions.jsx @@ -1,14 +1,13 @@ import {Box} from "@mui/material"; import Update from "./Form/UpdateForm"; -const TableRowActions = ({row, mutate, fetchUrl}) => { +const TableRowActions = ({row, mutate}) => { return ( ); diff --git a/src/components/dashboard/refahi-province-manager/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/refahi-province-manager/Form/ConfirmForm/ConfirmContent.jsx index 78c8953..6e42765 100644 --- a/src/components/dashboard/refahi-province-manager/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/refahi-province-manager/Form/ConfirmForm/ConfirmContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; import {CONFIRM_REFAHI_PROVINCE_MANAGER} from "@/core/data/apiRoutes"; import UploadFileNotification from "@/core/components/notifications/UploadFileNotification"; -import { useState } from "react"; +import {useState} from "react"; -const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { +const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => { const t = useTranslations(); const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); @@ -30,7 +30,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { requestServer(`${CONFIRM_REFAHI_PROVINCE_MANAGER}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -63,7 +63,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { } }; - return( + return ( <> diff --git a/src/components/dashboard/refahi-province-manager/Form/ConfirmForm/index.jsx b/src/components/dashboard/refahi-province-manager/Form/ConfirmForm/index.jsx index 3683d82..95a6367 100644 --- a/src/components/dashboard/refahi-province-manager/Form/ConfirmForm/index.jsx +++ b/src/components/dashboard/refahi-province-manager/Form/ConfirmForm/index.jsx @@ -1,13 +1,13 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useTranslations } from "next-intl"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material"; +import {useTranslations} from "next-intl"; import ThumbUpAltIcon from "@mui/icons-material/ThumbUpAlt"; -import { useState } from "react"; +import {useState} from "react"; import ConfirmContent from "./ConfirmContent"; -const Confirm = ({rowId, fetchUrl, mutate}) => { +const Confirm = ({rowId, mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); - return( + return ( <> { {t("ConfirmDialog.confirm")} - + ) diff --git a/src/components/dashboard/refahi-province-manager/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/refahi-province-manager/Form/RejectForm/RejectContent.jsx index 5eaf16e..0330996 100644 --- a/src/components/dashboard/refahi-province-manager/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/refahi-province-manager/Form/RejectForm/RejectContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem" import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; +import {useState} from "react"; import * as Yup from "yup"; import {REJECT_REFAHI_PROVINCE_MANAGER} from "@/core/data/apiRoutes"; -const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { +const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); const [fileName, setfileName] = useState(null); @@ -35,7 +35,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { requestServer(`${REJECT_REFAHI_PROVINCE_MANAGER}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -66,7 +66,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { setShowAddIcon(false); } }; - return( + return ( <> diff --git a/src/components/dashboard/refahi-province-manager/Form/RejectForm/index.jsx b/src/components/dashboard/refahi-province-manager/Form/RejectForm/index.jsx index 678a842..06608f5 100644 --- a/src/components/dashboard/refahi-province-manager/Form/RejectForm/index.jsx +++ b/src/components/dashboard/refahi-province-manager/Form/RejectForm/index.jsx @@ -1,10 +1,10 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material" -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material" +import {useTranslations} from "next-intl"; +import {useState} from "react"; import RejectContent from "./RejectContent"; import ThumbDownIcon from "@mui/icons-material/ThumbDown"; -const Reject = ({rowId, fetchUrl, mutate}) => { +const Reject = ({rowId, mutate}) => { const t = useTranslations(); const [openRejectDialog, setOpenRejectDialog] = useState(false); return ( @@ -17,7 +17,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => { {t("RejectDialog.reject")} - + ) diff --git a/src/components/dashboard/refahi-province-manager/TableRowActions.jsx b/src/components/dashboard/refahi-province-manager/TableRowActions.jsx index 121d4e0..69f9d6f 100644 --- a/src/components/dashboard/refahi-province-manager/TableRowActions.jsx +++ b/src/components/dashboard/refahi-province-manager/TableRowActions.jsx @@ -2,18 +2,16 @@ import {Box} from "@mui/material"; import Confirm from "./Form/ConfirmForm"; import Reject from "./Form/RejectForm"; -const TableRow = ({row, mutate, fetchUrl}) => { +const TableRow = ({row, mutate}) => { return ( diff --git a/src/components/dashboard/role-management/Form/CreateForm/CreateContent.jsx b/src/components/dashboard/role-management/Form/CreateForm/CreateContent.jsx index b223bdc..45b14ba 100644 --- a/src/components/dashboard/role-management/Form/CreateForm/CreateContent.jsx +++ b/src/components/dashboard/role-management/Form/CreateForm/CreateContent.jsx @@ -18,7 +18,7 @@ import {useFormik} from "formik"; import {ADD_ROLE_MANAGEMENT} from "@/core/data/apiRoutes"; import usePermissions from "@/lib/app/hooks/usePermissions"; -const CreateContent = ({mutate, fetchUrl, setOpenConfirmDialog}) => { +const CreateContent = ({mutate, setOpenConfirmDialog}) => { const t = useTranslations(); const requestServer = useRequest({auth: true}) const {permissions_list} = usePermissions() @@ -44,7 +44,7 @@ const CreateContent = ({mutate, fetchUrl, setOpenConfirmDialog}) => { data: formData, }).then((response) => { setOpenConfirmDialog(false) - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -57,7 +57,7 @@ const CreateContent = ({mutate, fetchUrl, setOpenConfirmDialog}) => { <> - + { +const CreateForm = ({mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); @@ -27,7 +27,7 @@ const CreateForm = ({mutate, fetchUrl}) => { {t("AddDialog.add")} - + ) diff --git a/src/components/dashboard/role-management/Form/DeleteForm.jsx b/src/components/dashboard/role-management/Form/DeleteForm.jsx index 9c613b1..78319bd 100644 --- a/src/components/dashboard/role-management/Form/DeleteForm.jsx +++ b/src/components/dashboard/role-management/Form/DeleteForm.jsx @@ -15,7 +15,7 @@ import useRequest from "@/lib/app/hooks/useRequest"; import useNotification from "@/lib/app/hooks/useNotification"; import {DELETE_ROLE_MANAGEMENT} from "@/core/data/apiRoutes"; -const DeleteForm = ({rowId, fetchUrl, mutate}) => { +const DeleteForm = ({rowId, mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); const [isSubmitting, setIsSubmitting] = useState(false) @@ -24,7 +24,7 @@ const DeleteForm = ({rowId, fetchUrl, mutate}) => { const handleSubmit = () => { setIsSubmitting(true) requestServer(`${DELETE_ROLE_MANAGEMENT}/${rowId}`, 'delete').then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { diff --git a/src/components/dashboard/role-management/Form/UpdateForm/UpdateContent.jsx b/src/components/dashboard/role-management/Form/UpdateForm/UpdateContent.jsx index a52f6b8..5cbfa6b 100644 --- a/src/components/dashboard/role-management/Form/UpdateForm/UpdateContent.jsx +++ b/src/components/dashboard/role-management/Form/UpdateForm/UpdateContent.jsx @@ -1,13 +1,25 @@ -import { UPDATE_ROLE_MANAGEMENT } from "@/core/data/apiRoutes"; +import {UPDATE_ROLE_MANAGEMENT} from "@/core/data/apiRoutes"; import useNotification from "@/lib/app/hooks/useNotification"; import usePermissions from "@/lib/app/hooks/usePermissions"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, Checkbox, DialogActions, DialogContent, FormControl, FormControlLabel, FormHelperText, FormLabel, Grid, Stack, TextField } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; +import { + Button, + Checkbox, + DialogActions, + DialogContent, + FormControl, + FormControlLabel, + FormHelperText, + FormLabel, + Grid, + Stack, + TextField +} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; import * as Yup from "yup"; -const UpdateContent = ({row, fetchUrl, mutate, setOpenConfirmDialog}) => { +const UpdateContent = ({row, mutate, setOpenConfirmDialog}) => { const t = useTranslations(); const requestServer = useRequest({auth: true}) const {update_notification} = useNotification() @@ -35,7 +47,7 @@ const UpdateContent = ({row, fetchUrl, mutate, setOpenConfirmDialog}) => { requestServer(`${UPDATE_ROLE_MANAGEMENT}/${row.getValue("id")}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -43,11 +55,11 @@ const UpdateContent = ({row, fetchUrl, mutate, setOpenConfirmDialog}) => { }); }, }); - return( + return ( <> - + { +const Update = ({row, mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); - + return ( <> @@ -23,7 +23,7 @@ const Update = ({row, fetchUrl, mutate}) => { {t("UpdateDialog.update")} - + ) diff --git a/src/components/dashboard/role-management/TableRowActions.jsx b/src/components/dashboard/role-management/TableRowActions.jsx index 8eb5a35..dfa1e34 100644 --- a/src/components/dashboard/role-management/TableRowActions.jsx +++ b/src/components/dashboard/role-management/TableRowActions.jsx @@ -2,18 +2,16 @@ import {Box} from "@mui/material"; import DeleteForm from "./Form/DeleteForm" import Update from "./Form/UpdateForm"; -const TableRowActions = ({row, mutate, fetchUrl}) => { +const TableRowActions = ({row, mutate}) => { return ( diff --git a/src/components/dashboard/role-management/TableToolbar.jsx b/src/components/dashboard/role-management/TableToolbar.jsx index c4cb13b..734cb4a 100644 --- a/src/components/dashboard/role-management/TableToolbar.jsx +++ b/src/components/dashboard/role-management/TableToolbar.jsx @@ -1,10 +1,10 @@ import {useTranslations} from "next-intl"; import CreateForm from "./Form/CreateForm/index"; -function TableToolbar({mutate, fetchUrl}) { +function TableToolbar({mutate}) { const t = useTranslations(); - return + return } diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx index c5533ee..8cefbcf 100644 --- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; import {CONFIRM_TRANSPORTATION_ASSISTANCE} from "@/core/data/apiRoutes"; import UploadFileNotification from "@/core/components/notifications/UploadFileNotification"; -import { useState } from "react"; +import {useState} from "react"; -const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { +const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => { const t = useTranslations(); const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); @@ -30,7 +30,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { requestServer(`${CONFIRM_TRANSPORTATION_ASSISTANCE}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -63,7 +63,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => { } }; - return( + return ( <> diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/index.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/index.jsx index 3683d82..95a6367 100644 --- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/index.jsx +++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/index.jsx @@ -1,13 +1,13 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"; -import { useTranslations } from "next-intl"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material"; +import {useTranslations} from "next-intl"; import ThumbUpAltIcon from "@mui/icons-material/ThumbUpAlt"; -import { useState } from "react"; +import {useState} from "react"; import ConfirmContent from "./ConfirmContent"; -const Confirm = ({rowId, fetchUrl, mutate}) => { +const Confirm = ({rowId, mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); - return( + return ( <> { {t("ConfirmDialog.confirm")} - + ) diff --git a/src/components/dashboard/transportation-assistance/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/transportation-assistance/Form/RejectForm/RejectContent.jsx index 3ce51e9..e5227d8 100644 --- a/src/components/dashboard/transportation-assistance/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/RejectForm/RejectContent.jsx @@ -1,14 +1,14 @@ import UploadSystem from "@/core/components/UploadSystem" import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, Stack, TextField, Typography } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; +import {useState} from "react"; import * as Yup from "yup"; import {REJECT_TRANSPORTATION_ASSISTANCE} from "@/core/data/apiRoutes"; -const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { +const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); const [fileName, setfileName] = useState(null); @@ -35,7 +35,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { requestServer(`${REJECT_TRANSPORTATION_ASSISTANCE}/${rowId}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -66,7 +66,7 @@ const RejectContent = ({rowId, fetchUrl, mutate, setOpenRejectDialog}) => { setShowAddIcon(false); } }; - return( + return ( <> diff --git a/src/components/dashboard/transportation-assistance/Form/RejectForm/index.jsx b/src/components/dashboard/transportation-assistance/Form/RejectForm/index.jsx index 678a842..06608f5 100644 --- a/src/components/dashboard/transportation-assistance/Form/RejectForm/index.jsx +++ b/src/components/dashboard/transportation-assistance/Form/RejectForm/index.jsx @@ -1,10 +1,10 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material" -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material" +import {useTranslations} from "next-intl"; +import {useState} from "react"; import RejectContent from "./RejectContent"; import ThumbDownIcon from "@mui/icons-material/ThumbDown"; -const Reject = ({rowId, fetchUrl, mutate}) => { +const Reject = ({rowId, mutate}) => { const t = useTranslations(); const [openRejectDialog, setOpenRejectDialog] = useState(false); return ( @@ -17,7 +17,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => { {t("RejectDialog.reject")} - + ) diff --git a/src/components/dashboard/transportation-assistance/TableRowActions.jsx b/src/components/dashboard/transportation-assistance/TableRowActions.jsx index 121d4e0..69f9d6f 100644 --- a/src/components/dashboard/transportation-assistance/TableRowActions.jsx +++ b/src/components/dashboard/transportation-assistance/TableRowActions.jsx @@ -2,18 +2,16 @@ import {Box} from "@mui/material"; import Confirm from "./Form/ConfirmForm"; import Reject from "./Form/RejectForm"; -const TableRow = ({row, mutate, fetchUrl}) => { +const TableRow = ({row, mutate}) => { return ( diff --git a/src/components/dashboard/user-management/Form/CreateForm/CreateContent.jsx b/src/components/dashboard/user-management/Form/CreateForm/CreateContent.jsx index 0a1b5e2..7f35017 100644 --- a/src/components/dashboard/user-management/Form/CreateForm/CreateContent.jsx +++ b/src/components/dashboard/user-management/Form/CreateForm/CreateContent.jsx @@ -16,7 +16,7 @@ import * as Yup from "yup"; import {useFormik} from "formik"; import {ADD_USER_MANAGEMENT} from "@/core/data/apiRoutes"; -const CreateContent = ({mutate, fetchUrl, setOpenConfirmDialog}) => { +const CreateContent = ({mutate, setOpenConfirmDialog}) => { const t = useTranslations(); const requestServer = useRequest({auth: true}) const validationSchema = Yup.object().shape({ @@ -51,7 +51,7 @@ const CreateContent = ({mutate, fetchUrl, setOpenConfirmDialog}) => { data: formData, }).then((response) => { setOpenConfirmDialog(false) - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { diff --git a/src/components/dashboard/user-management/Form/CreateForm/index.jsx b/src/components/dashboard/user-management/Form/CreateForm/index.jsx index 58e5224..3eef755 100644 --- a/src/components/dashboard/user-management/Form/CreateForm/index.jsx +++ b/src/components/dashboard/user-management/Form/CreateForm/index.jsx @@ -4,7 +4,7 @@ import {useTranslations} from "next-intl"; import {useState} from "react"; import CreateContent from "@/components/dashboard/user-management/Form/CreateForm/CreateContent"; -const CreateForm = ({mutate, fetchUrl}) => { +const CreateForm = ({mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); @@ -27,7 +27,7 @@ const CreateForm = ({mutate, fetchUrl}) => { {t("AddDialog.add")} - + ) diff --git a/src/components/dashboard/user-management/Form/DeleteForm.jsx b/src/components/dashboard/user-management/Form/DeleteForm.jsx index 5cf2eb3..40aa5e7 100644 --- a/src/components/dashboard/user-management/Form/DeleteForm.jsx +++ b/src/components/dashboard/user-management/Form/DeleteForm.jsx @@ -15,7 +15,7 @@ import {DELETE_USER_MANAGEMENT} from "@/core/data/apiRoutes"; import useRequest from "@/lib/app/hooks/useRequest"; import useNotification from "@/lib/app/hooks/useNotification"; -const DeleteForm = ({rowId, fetchUrl, mutate}) => { +const DeleteForm = ({rowId, mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); const [isSubmitting, setIsSubmitting] = useState(false) @@ -24,7 +24,7 @@ const DeleteForm = ({rowId, fetchUrl, mutate}) => { const handleSubmit = () => { setIsSubmitting(true) requestServer(`${DELETE_USER_MANAGEMENT}/${rowId}`, 'delete').then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { diff --git a/src/components/dashboard/user-management/Form/UpdateForm/UpdateContent.jsx b/src/components/dashboard/user-management/Form/UpdateForm/UpdateContent.jsx index 01db763..b5fb13d 100644 --- a/src/components/dashboard/user-management/Form/UpdateForm/UpdateContent.jsx +++ b/src/components/dashboard/user-management/Form/UpdateForm/UpdateContent.jsx @@ -1,12 +1,23 @@ -import { UPDATE_USER_MANAGEMENT } from "@/core/data/apiRoutes"; +import {UPDATE_USER_MANAGEMENT} from "@/core/data/apiRoutes"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import { Button, DialogActions, DialogContent, FormControl, FormHelperText, InputLabel, MenuItem, Select, Stack, TextField } from "@mui/material" -import { useFormik } from "formik"; -import { useTranslations } from "next-intl"; +import { + Button, + DialogActions, + DialogContent, + FormControl, + FormHelperText, + InputLabel, + MenuItem, + Select, + Stack, + TextField +} from "@mui/material" +import {useFormik} from "formik"; +import {useTranslations} from "next-intl"; import * as Yup from "yup"; -const UpdateContent = ({row, fetchUrl, mutate, setOpenConfirmDialog}) => { +const UpdateContent = ({row, mutate, setOpenConfirmDialog}) => { const t = useTranslations(); const requestServer = useRequest({auth: true}) const {update_notification} = useNotification() @@ -31,7 +42,7 @@ const UpdateContent = ({row, fetchUrl, mutate, setOpenConfirmDialog}) => { phone_number: row.getValue("phone_number"), national_id: row.getValue("national_id"), type_id: row.original.type_id, - navgan_id:row.original.type_id === 1 ? row.getValue("navgan_id") : '', + navgan_id: row.original.type_id === 1 ? row.getValue("navgan_id") : '', }, validationSchema, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); formData.append("phone_number", values.phone_number); @@ -41,7 +52,7 @@ const UpdateContent = ({row, fetchUrl, mutate, setOpenConfirmDialog}) => { requestServer(`${UPDATE_USER_MANAGEMENT}/${row.getValue("id")}`, 'post', { data: formData, }).then((response) => { - mutate(fetchUrl) + mutate() update_notification() }).catch(() => { }).finally(() => { @@ -49,7 +60,7 @@ const UpdateContent = ({row, fetchUrl, mutate, setOpenConfirmDialog}) => { }); }, }); - return( + return ( <> diff --git a/src/components/dashboard/user-management/Form/UpdateForm/index.jsx b/src/components/dashboard/user-management/Form/UpdateForm/index.jsx index 93f89f8..a00cd74 100644 --- a/src/components/dashboard/user-management/Form/UpdateForm/index.jsx +++ b/src/components/dashboard/user-management/Form/UpdateForm/index.jsx @@ -1,10 +1,10 @@ -import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material" +import {Dialog, DialogTitle, IconButton, Tooltip} from "@mui/material" import EditIcon from '@mui/icons-material/Edit'; -import { useTranslations } from "next-intl"; -import { useState } from "react"; +import {useTranslations} from "next-intl"; +import {useState} from "react"; import UpdateContent from "./UpdateContent"; -const Update = ({row, fetchUrl, mutate}) => { +const Update = ({row, mutate}) => { const t = useTranslations(); const [openConfirmDialog, setOpenConfirmDialog] = useState(false); return ( @@ -22,9 +22,9 @@ const Update = ({row, fetchUrl, mutate}) => { {t("UpdateDialog.update")} - + - ) + ) } export default Update \ No newline at end of file diff --git a/src/components/dashboard/user-management/TableRowActions.jsx b/src/components/dashboard/user-management/TableRowActions.jsx index 8eb5a35..dfa1e34 100644 --- a/src/components/dashboard/user-management/TableRowActions.jsx +++ b/src/components/dashboard/user-management/TableRowActions.jsx @@ -2,18 +2,16 @@ import {Box} from "@mui/material"; import DeleteForm from "./Form/DeleteForm" import Update from "./Form/UpdateForm"; -const TableRowActions = ({row, mutate, fetchUrl}) => { +const TableRowActions = ({row, mutate}) => { return ( diff --git a/src/components/dashboard/user-management/TableToolbar.jsx b/src/components/dashboard/user-management/TableToolbar.jsx index 9ea36f5..8653e08 100644 --- a/src/components/dashboard/user-management/TableToolbar.jsx +++ b/src/components/dashboard/user-management/TableToolbar.jsx @@ -1,10 +1,10 @@ import {useTranslations} from "next-intl"; import CreateForm from "@/components/dashboard/user-management/Form/CreateForm"; -function TableToolbar({mutate, fetchUrl}) { +function TableToolbar({mutate}) { const t = useTranslations(); - return + return } diff --git a/src/core/components/DataTable.jsx b/src/core/components/DataTable.jsx index b41f19f..0e866f1 100644 --- a/src/core/components/DataTable.jsx +++ b/src/core/components/DataTable.jsx @@ -9,15 +9,6 @@ import useRequest from "@/lib/app/hooks/useRequest"; function DataTable(props) { const requestServer = useRequest({auth: true}) - const fetcher = (...args) => { - return requestServer(args, 'get', { - pending: false, success: {notification: {show: false}} - }).then((response) => { - setRowCount(response.data.meta.totalRowCount); - return response.data.data; - }).catch(() => { - }) - }; const t = useTranslations(); const {languageApp, languageList} = useLanguage(); const [columnFilters, setColumnFilters] = useState([]); @@ -60,9 +51,18 @@ function DataTable(props) { return url; }, [props.tableUrl, columnFilters, columnFilterFns, pagination, sorting, props.columns,]); - const {data, isValidating, mutate} = useSWR(fetchUrl, fetcher, { - revalidateIfStale: false, revalidateOnFocus: false, revalidateOnReconnect: false - }); + const {data, isValidating, mutate} = useSWR(fetchUrl, (...args) => + requestServer(args, 'get', { + pending: false, + success: {notification: {show: false}} + }).then((response) => response.data).catch(() => { + }) + , { + revalidateIfStale: false, + revalidateOnFocus: false, + revalidateOnReconnect: true, + keepPreviousData: true + }); useEffect(() => { setupdateTime(moment().format("HH:mm | jYYYY/jM/jD")); @@ -70,7 +70,7 @@ function DataTable(props) { return ( (<> {props.enableCustomToolbar /* send condition */ ? - /* send component */ : } + /* send component */ : } )} renderBottomToolbarCustomActions={({table}) => (<> {props.enableLastUpdate /* send condition */ ? ( } + renderRowActions={({row}) => } {...props} />); }