From 039bd3c6e310e04aab1316ddc0c305b78ebb3b7b Mon Sep 17 00:00:00 2001
From: AmirHossein Mahmoodi <amir.mahmoodi74@gmail.com>
Date: Sat, 30 Sep 2023 11:05:18 +0330
Subject: [PATCH] TF-105 remove require email and city in add and edit form
 expert management page

---
 public/locales/fa/app.json                           | 12 ++++++------
 .../Form/CreateForm/CreateContent.jsx                |  4 ++--
 .../Form/UpdateForm/UpdateContent.jsx                |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json
index 70f243a..f4df724 100644
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -389,11 +389,11 @@
     "button_submit": "افزودن کارشناس",
     "button_close": "بستن",
     "button_delete": "حذف",
-    "add": "افزودن کارشناس",
+    "add": "افزودن",
     "button-cancel": "بستن",
     "button-confirm": "ثبت",
-    "create": "افزودن کارشناس",
-    "update": "ویرایش کارشناس",
+    "create": "افزودن",
+    "update": "ویرایش",
     "change_password": "تغییر رمز عبور",
     "text_field_name": "نام",
     "text_field_username": "نام کاربری",
@@ -405,8 +405,8 @@
     "text_field_province_id": "استان",
     "text_field_city_id": "شهر",
     "text_field_role_id": "نقش",
-    "text_field_loading_provinces_list": "درحال دریافت شهر ها",
-    "text_field_error_fetching_provinces": "خطا در دریافت شهر ها",
+    "text_field_loading_provinces_list": "درحال دریافت استان ها",
+    "text_field_error_fetching_provinces": "خطا در دریافت استان ها",
     "text_field_loading_roles_list": "درحال دریافت نقش ها",
     "text_field_error_fetching_roles": "خطا در دریافت نقش ها",
     "text_field_please_select_province": "ابتدا استان خود را انتخاب کنید",
@@ -442,7 +442,7 @@
     "button-delete": "حذف کردن"
   },
   "AddDialog": {
-    "add": "افزودن کاربر جدید",
+    "add": "افزودن",
     "name": "نام انگلیسی",
     "name_error": "وارد کردن نام انگلیسی الزامیست",
     "name_fa": "نام فارسی",
diff --git a/src/components/dashboard/expert-management/Form/CreateForm/CreateContent.jsx b/src/components/dashboard/expert-management/Form/CreateForm/CreateContent.jsx
index 14e0032..dc9e62f 100644
--- a/src/components/dashboard/expert-management/Form/CreateForm/CreateContent.jsx
+++ b/src/components/dashboard/expert-management/Form/CreateForm/CreateContent.jsx
@@ -61,7 +61,7 @@ const CreateContent = ({setOpenCreateDialog, mutate, fetchUrl}) => {
     const validationSchema = Yup.object().shape({
         name: Yup.string().required(t("ExpertMangement.error_message_name")),
         username: Yup.string().required(t("ExpertMangement.error_message_username")),
-        email: Yup.string().required(t("ExpertMangement.error_message_email")),
+        email: Yup.string(),
         phone_number: Yup.string().required(t("ExpertMangement.error_message_phone_number")),
         national_id: Yup.string().required(t("ExpertMangement.error_message_national_id")),
         password: Yup.string()
@@ -72,7 +72,7 @@ const CreateContent = ({setOpenCreateDialog, mutate, fetchUrl}) => {
             ),
         position: Yup.string().required(t("ExpertMangement.error_message_position")),
         province_id: Yup.string().required(t("ExpertMangement.error_message_province_id")),
-        city_id: Yup.string().required(t("ExpertMangement.error_message_city_id")),
+        city_id: Yup.string(),
         role_id: Yup.string().required(t("ExpertMangement.error_message_role_id"))
     });
 
diff --git a/src/components/dashboard/expert-management/Form/UpdateForm/UpdateContent.jsx b/src/components/dashboard/expert-management/Form/UpdateForm/UpdateContent.jsx
index a18dd01..dc6864c 100644
--- a/src/components/dashboard/expert-management/Form/UpdateForm/UpdateContent.jsx
+++ b/src/components/dashboard/expert-management/Form/UpdateForm/UpdateContent.jsx
@@ -54,12 +54,12 @@ const UpdateContent = ({row, fetchUrl, mutate, setOpenUpdateDialog}) => {
     const validationSchema = Yup.object().shape({
         name: Yup.string().required(t("ExpertMangement.error_message_name")),
         username: Yup.string().required(t("ExpertMangement.error_message_username")),
-        email: Yup.string().required(t("ExpertMangement.error_message_email")),
+        email: Yup.string(),
         phone_number: Yup.string().required(t("ExpertMangement.error_message_phone_number")),
         national_id: Yup.string().required(t("ExpertMangement.error_message_national_id")),
         position: Yup.string().required(t("ExpertMangement.error_message_position")),
         province_id: Yup.string().required(t("ExpertMangement.error_message_province_id")),
-        city_id: Yup.string().required(t("ExpertMangement.error_message_city_id")),
+        city_id: Yup.string(),
         role_id: Yup.string().required(t("ExpertMangement.error_message_role_id"))
     });
     const formik = useFormik({