moaz_dw/mns-dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix error

Browse Source
This commit is contained in:
karimalden 2024-07-31 11:55:04 +03:00
parent 390bfb1678
commit 37920782b6
2 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Components/ValidationField/View/File.tsx
View File

@ -1,16 +1,9 @@
<<<<<<< HEAD
import { Button, Upload, UploadFile } from 'antd' import { Button, Upload, UploadFile } from 'antd'
import useFormField from '../../../Hooks/useFormField'; import useFormField from '../../../Hooks/useFormField';
import { UploadOutlined } from '@ant-design/icons'; import { UploadOutlined } from '@ant-design/icons';
import { BaseURL, BaseURL_IMAGE } from '../../../api/config'; import { BaseURL, BaseURL_IMAGE } from '../../../api/config';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { ErrorMessage } from 'formik'; import { ErrorMessage } from 'formik';
=======
import { Button, Upload, UploadFile } from "antd";
import useFormField from "../../../Hooks/useFormField";
import React, { useMemo } from "react";
import { FaUpload } from "react-icons/fa";
>>>>>>> c6ee1f60784e6dd9e87132499ccbeb09ece51f63
const File = ({ name, label, onChange, isDisabled, accept, props }: any) => { const File = ({ name, label, onChange, isDisabled, accept, props }: any) => {
@ -50,26 +43,6 @@ const File = ({ name, label, onChange, isDisabled, accept, props }: any) => {
defaultFileList={[...fileList]} defaultFileList={[...fileList]}
onChange={onChange || FilehandleChange} onChange={onChange || FilehandleChange}
customRequest={customRequest} customRequest={customRequest}
<<<<<<< HEAD
=======
className={` w-100`}
id={name}
>
<Button
className={isError ? "isError w-100 " : " w-100"}
icon={<FaUpload />}
>
{placeholder
? t(`input.${placeholder}`)
: t("input.Click_to_upload_the_image")}
</Button>
<div className="Error_color"> {isError ? "required" : ""}</div>
{errorMsg}
</Upload>
</div>
);
};
>>>>>>> c6ee1f60784e6dd9e87132499ccbeb09ece51f63
> >
<Button className='w-100' icon={<UploadOutlined />}>{t("upload_image")}</Button> <Button className='w-100' icon={<UploadOutlined />}>{t("upload_image")}</Button>

9
src/Hooks/useFormField.tsx
View File

@ -1,7 +1,6 @@
import { useField, useFormikContext } from "formik"; import { useField, useFormikContext } from "formik";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Field } from "formik"; import { Field } from "formik";
import { useValidationState } from "../Components/ValidationField/utils/ValidationState";
import { useEffect } from "react"; import { useEffect } from "react";
const useFormField = (name: string, props?: any) => { const useFormField = (name: string, props?: any) => {
@ -9,15 +8,11 @@ const useFormField = (name: string, props?: any) => {
const { t } = useTranslation(); const { t } = useTranslation();
const formik = useFormikContext<any>(); const formik = useFormikContext<any>();
const { Validation, setValidation } = useValidationState((state) => state);
const isError = !!((meta.touched && meta.error) || Validation[name as any]); const isError = !!((meta.touched && meta.error));
const errorMsg = const errorMsg = !!isError && meta.error && t(meta.error.toString());
!!isError && meta.error
? t(meta.error.toString())
: t(Validation[name as any]) ?? "";
return { Field, field, meta, formik, isError, errorMsg, t }; return { Field, field, meta, formik, isError, errorMsg, t };
}; };