From 87f26f90e0e3650a13612b7e747bca7ffd5e66ef Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Sat, 30 Sep 2023 11:49:08 +0330 Subject: [PATCH] TF-103 debug add page accessibility and edit form redirecting follow up problem --- public/locales/fa/app.json | 3 +- .../add-request-loan/accessibility/index.jsx | 32 +++++++++++++++++++ .../refahi/add-request-loan/forms/AddForm.jsx | 5 ++- .../refahi/add-request-loan/index.jsx | 5 ++- .../edit-request-loan/forms/EditForm.jsx | 4 +-- .../refahi/edit-request-loan/index.jsx | 18 +++++++---- 6 files changed, 52 insertions(+), 15 deletions(-) create mode 100644 src/components/dashboard/refahi/add-request-loan/accessibility/index.jsx diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 263693a..0c9d741 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -158,7 +158,8 @@ "file_field_payan_khedmat_image": "تصویر کارت پایان خدمت", "error_message_national_card_image": "تصویر کارت ملی خود را وارد کنید", "error_message_shenasname_image": "تصویر شناسنامه خود را وارد کنید", - "error_message_payan_khedmat_image": "تصویر کارت پایان خدمت خود را وارد کنید" + "error_message_payan_khedmat_image": "تصویر کارت پایان خدمت خود را وارد کنید", + "add_loan_request_permission": "اکنون امکان ثبت درخواست جدید برای شما مقدور نیست" }, "EditLoanRequest": { "edit_loan_request_page": "ویرایش درخواست وام" diff --git a/src/components/dashboard/refahi/add-request-loan/accessibility/index.jsx b/src/components/dashboard/refahi/add-request-loan/accessibility/index.jsx new file mode 100644 index 0000000..3618d0b --- /dev/null +++ b/src/components/dashboard/refahi/add-request-loan/accessibility/index.jsx @@ -0,0 +1,32 @@ +import {Button, Typography} from "@mui/material"; +import {useTranslations} from "next-intl"; +import CenterLayout from "@/layouts/CenterLayout"; +import {useRouter} from "next/router"; +import {NextLinkComposed} from "@/core/components/LinkRouting"; + +const AccessibilityComponent = () => { + const t = useTranslations(); + const router = useRouter(); + + return ( + + + {t("LoanRequest.add_loan_request_permission")} + + + + ); +}; + +export default AccessibilityComponent; diff --git a/src/components/dashboard/refahi/add-request-loan/forms/AddForm.jsx b/src/components/dashboard/refahi/add-request-loan/forms/AddForm.jsx index 76bdb1a..4051854 100644 --- a/src/components/dashboard/refahi/add-request-loan/forms/AddForm.jsx +++ b/src/components/dashboard/refahi/add-request-loan/forms/AddForm.jsx @@ -20,11 +20,13 @@ import {useTranslations} from "next-intl"; import * as Yup from "yup"; import useRequest from "@/lib/app/hooks/useRequest"; import useProvince from "@/lib/app/hooks/useProvince"; +import {useRouter} from "next/router"; const AddFormComponent = () => { const t = useTranslations(); const requestServer = useRequest() - const {provinceList, isLoadingProvinceList, errorProvinceList} = useProvince() + const {provinceList, isLoadingProvinceList, errorProvinceList} = useProvince(); + const router = useRouter(); // initial values, validation and request action of form const initialValues = { @@ -81,6 +83,7 @@ const AddFormComponent = () => { formData.append("payan_khedmat_image", values.payan_khedmat_image); requestServer(SEND_LOAN_REQUEST_WELFARE, "post", {auth: true, data: formData}) .then(function (response) { + router.replace('/dashboard/refahi/followUp-loan'); }) .catch(function (error) { }) diff --git a/src/components/dashboard/refahi/add-request-loan/index.jsx b/src/components/dashboard/refahi/add-request-loan/index.jsx index feb8df0..bc82ac7 100644 --- a/src/components/dashboard/refahi/add-request-loan/index.jsx +++ b/src/components/dashboard/refahi/add-request-loan/index.jsx @@ -1,16 +1,15 @@ import DashboardLayouts from "@/layouts/dashboardLayouts"; import useUser from "@/lib/app/hooks/useUser"; -import {Box, Chip, Divider} from "@mui/material"; import {useTranslations} from "next-intl"; import AddFormComponent from "@/components/dashboard/refahi/add-request-loan/forms/AddForm"; +import AccessibilityComponent from "@/components/dashboard/refahi/add-request-loan/accessibility"; const LoanRequestComponent = () => { const t = useTranslations(); const {user} = useUser(); - return ( - + {user.can_request_a_new_loan ? : } ); }; diff --git a/src/components/dashboard/refahi/edit-request-loan/forms/EditForm.jsx b/src/components/dashboard/refahi/edit-request-loan/forms/EditForm.jsx index 71d9660..36f5aa0 100644 --- a/src/components/dashboard/refahi/edit-request-loan/forms/EditForm.jsx +++ b/src/components/dashboard/refahi/edit-request-loan/forms/EditForm.jsx @@ -15,11 +15,9 @@ import useLoading from "@/lib/app/hooks/useLoading"; const EditFormComponent = ({provinceList, initialValues}) => { const t = useTranslations(); - const {directionApp} = useDirection(); - const {token} = useUser(); const requestServer = useRequest(); const router = useRouter(); - const {setLoadingPage} = useLoading(); + // validation and request action of form const validationSchema = Yup.object().shape({ diff --git a/src/components/dashboard/refahi/edit-request-loan/index.jsx b/src/components/dashboard/refahi/edit-request-loan/index.jsx index f2ab1e1..89de937 100644 --- a/src/components/dashboard/refahi/edit-request-loan/index.jsx +++ b/src/components/dashboard/refahi/edit-request-loan/index.jsx @@ -5,6 +5,7 @@ import {DETAILS_LOAN_REQUEST_WELFARE, GET_PROVINCE_LIST} from "@/core/data/apiRo import useLoading from "@/lib/app/hooks/useLoading"; import useRequest from "@/lib/app/hooks/useRequest"; import {useRouter} from "next/router"; +import {log} from "next/dist/server/typescript/utils"; const LoanRequestComponent = () => { const requestServer = useRequest(); @@ -60,17 +61,20 @@ const LoanRequestComponent = () => { // Redirect to /dashboard/refahi/followUp-loan if state_id is not 7 useEffect(() => { - if (initialValues && initialValues.state_id !== 7) { - router.push('/dashboard/refahi/followUp-loan'); - } - }, [initialValues, router]); + if (!initialValues) return + if (initialValues.state_id === 7) return + + router.replace('/dashboard/refahi/followUp-loan'); + }, [initialValues]); return ( - + <> {initialValues && initialValues.state_id === 7 && ( - + + + )} - + ); };