From b34ba269c11fe56bf488a43bedb4e1a0041c8b51 Mon Sep 17 00:00:00 2001 From: karimalden Date: Sat, 29 Jun 2024 12:11:32 +0300 Subject: [PATCH] dix_error_add_empty_tag --- src/Pages/question/AddPage.tsx | 12 ++++++++---- src/Pages/question/Model/formUtil.ts | 2 +- src/api/config.ts | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Pages/question/AddPage.tsx b/src/Pages/question/AddPage.tsx index f89a918..9816898 100644 --- a/src/Pages/question/AddPage.tsx +++ b/src/Pages/question/AddPage.tsx @@ -12,7 +12,6 @@ import Header from "../../Components/exercise/Header"; import { Question } from "../../types/Item"; import BaseForm from './Model/Malty/Add' import Form from './Model/Add' -import { toast } from "react-toastify"; const AcceptModal = lazy(() => import('./Model/AcceptModal')); import { useModalState } from "../../zustand/Modal"; @@ -22,6 +21,7 @@ import { hasItems } from "../../utils/hasItems"; import { QUESTION_OBJECT_KEY } from "../../config/AppKey"; import useSaveOnDisconnect from "../../Hooks/useSaveOnDisconnect"; import { getLocalStorageQuestions } from "../../utils/setLocalStorageQuestions"; +import { toast } from "react-toastify"; const AddPage: React.FC = () => { @@ -82,13 +82,19 @@ const AddPage: React.FC = () => { useEffect(() => { - + if (isSuccessAsync && ( SavedQuestionData?.Questions?.length > 0 ? isSuccess: true )) { set_object_to_edit(null) set_Success(true) localStorage.removeItem(QUESTION_OBJECT_KEY) } + if(isSuccess && !(SavedQuestionData?.Questions?.length)){ + toast.success(t("validation.the_possess_done_successful")) + set_object_to_edit(null) + set_Success(true) + localStorage.removeItem(QUESTION_OBJECT_KEY) + } }, [isSuccess,isSuccessAsync]) let cleanedQuestionOptions = cleanObject(SavedQuestionData); @@ -100,7 +106,6 @@ const AddPage: React.FC = () => { const SavedData = getLocalStorageQuestions(QUESTION_OBJECT_KEY) - console.log(SavedData); const handleCancel = () => { if(!noChange){ navigate(-1) @@ -114,7 +119,6 @@ const AddPage: React.FC = () => { const [t] = useTranslation(); - console.log(SavedData?.isBase === 1); if(isBseQuestion || SavedData?.isBase === 1){ diff --git a/src/Pages/question/Model/formUtil.ts b/src/Pages/question/Model/formUtil.ts index 992acee..3fb20b8 100644 --- a/src/Pages/question/Model/formUtil.ts +++ b/src/Pages/question/Model/formUtil.ts @@ -104,7 +104,7 @@ export function processTags(DataToSend: any) { }).filter((item:any) => item !== undefined); const newTags = DataToSend?.tags?.map((item: any, index: number) => { - if (typeof item?.id === "string") { + if (typeof item?.id === "string" && item?.name !== "" ) { return { name: item?.name }; } }).filter((item:any) => item !== undefined); diff --git a/src/api/config.ts b/src/api/config.ts index 985676d..5d922ad 100644 --- a/src/api/config.ts +++ b/src/api/config.ts @@ -1,7 +1,7 @@ // export const BaseURL = "http://192.168.1.108:8000/api/"; -// export const BaseURL = "http://127.0.0.1:8000/api/"; +export const BaseURL = "http://127.0.0.1:8000/api/"; -export const BaseURL = "https://exercise-automation.point-dev.net/api/"; +// export const BaseURL = "https://exercise-automation.point-dev.net/api/"; export const ImageBaseURL = "http://192.168.1.9:8000/";