This commit is contained in:
Majd_dk 2025-09-28 11:40:56 +03:00
parent afc7c7bf7a
commit 89e1b4a12d
6 changed files with 22 additions and 12 deletions

View File

@ -45,7 +45,7 @@ const useFilter = () => {
const handleState = () => { const handleState = () => {
if (isOpen === ModalEnum?.FILTER) { if (isOpen === ModalEnum?.FILTER) {
setIsOpen(""); setIsOpen("");
clearFilterState(); // clearFilterState();
setFormValues({}); setFormValues({});
} else { } else {
setIsOpen(ModalEnum?.FILTER); setIsOpen(ModalEnum?.FILTER);
@ -93,7 +93,7 @@ const useFilter = () => {
} }
// setIsOpen(""); // setIsOpen("");
clearFilterState(); // clearFilterState();
setFormValues({}); setFormValues({});
}; };

View File

@ -52,7 +52,6 @@ const EditPage: React.FC = () => {
}); });
const objectToEdit = { ...data?.data, Questions: Questions?.data }; const objectToEdit = { ...data?.data, Questions: Questions?.data };
console.log(objectToEdit);
useEffect(() => { useEffect(() => {
if (objectToEdit?.isBase && isBseQuestion !== true) { if (objectToEdit?.isBase && isBseQuestion !== true) {
@ -61,12 +60,14 @@ const EditPage: React.FC = () => {
}, [objectToEdit?.isBase]); }, [objectToEdit?.isBase]);
const [t] = useTranslation(); const [t] = useTranslation();
const handleSubmit = (values: any) => { const handleSubmit = (values: any) => {
const DataToSend = structuredClone(values); const DataToSend = structuredClone(values);
console.log(values)
setTagsSearch(null); setTagsSearch(null);
if (isBseQuestion) { if (isBseQuestion) {
setIsBseQuestion(false)
const UpdateBseQuestion = { const UpdateBseQuestion = {
id: DataToSend?.id, id: DataToSend?.id,
content: DataToSend?.content, content: DataToSend?.content,
@ -146,6 +147,7 @@ const EditPage: React.FC = () => {
}); });
} }
}); });
} else { } else {
const keysToRemove = ["content_image"]; const keysToRemove = ["content_image"];
console.log(DataToSend); console.log(DataToSend);
@ -199,11 +201,9 @@ const EditPage: React.FC = () => {
} }
}, [isSuccess]); }, [isSuccess]);
console.log(objectToEdit);
const Loading = const Loading =
QuestionsDataLoading || dataLoading || isRefetchingParent || isRefetching; QuestionsDataLoading || dataLoading || isRefetchingParent || isRefetching;
console.log(Loading);
const LoadingButton = isLoadingUpdate; const LoadingButton = isLoadingUpdate;
if (Loading) { if (Loading) {
return <SpinContainer />; return <SpinContainer />;

View File

@ -6,6 +6,7 @@ import Header from "../../../../../Components/exercise/Header";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { Spin } from "antd"; import { Spin } from "antd";
import BaseForm from "../../Model/Malty/Form"; import BaseForm from "../../Model/Malty/Form";
import { useMemo } from "react";
const BaseFormContainer = ({ const BaseFormContainer = ({
handleFormSubmit, handleFormSubmit,
@ -26,18 +27,22 @@ const BaseFormContainer = ({
const handleCancel = () => { const handleCancel = () => {
navigate(-1); navigate(-1);
}; };
const initialValues = useMemo(
() => getInitialValuesBase({} as any),
[]
);
return ( return (
<div className="QuestionPractical"> <div className="QuestionPractical">
<header> <header>
<MdOutlineArrowForwardIos onClick={handleNavigateToPage} />{" "} <MdOutlineArrowForwardIos onClick={handleNavigateToPage} className="link" />{" "}
{t("header.add_new_question")} {t("header.add_new_question")}
</header> </header>
<div className="exercise_add"> <div className="exercise_add">
<Formik <Formik
onSubmit={handleFormSubmit} onSubmit={handleFormSubmit}
initialValues={getInitialValuesBase({} as any)} initialValues={initialValues}
validationSchema={getValidationSchemaBase} validationSchema={getValidationSchemaBase}
enableReinitialize enableReinitialize
> >

View File

@ -82,9 +82,9 @@ const Form = () => {
name="hint" name="hint"
label={t("input.hint_question")} label={t("input.hint_question")}
type="TextArea" type="TextArea"
style={{ width: "100%", height: 60, resize: "none" }} // style={{ width: "100%", height: 60, resize: "none" }}
showCount={false} showCount={false}
autoSize={{ minRows: 2, maxRows: 10 }} // autoSize={{ minRows: 2, maxRows: 10 }}
/> />
)} )}
<SelectTag /> <SelectTag />

View File

@ -79,8 +79,10 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
name: tag?.name, name: tag?.name,
})); }));
const newAnswers = item?.answers?.map((item: any) => { const newAnswers = item?.answers?.map((item: any) => {
return { return {
...item, ...item,
id:item?.id ,
content: item?.content ?? null, content: item?.content ?? null,
}; };
}); });
@ -88,7 +90,8 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
return { return {
...item, ...item,
answer: newAnswers, id: item?.id,
answers: newAnswers,
hint: item?.hint ?? "", hint: item?.hint ?? "",
canAnswersBeShuffled: 0, canAnswersBeShuffled: 0,
isBase: 0, isBase: 0,
@ -96,8 +99,9 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
meta: item?.meta, meta: item?.meta,
}; };
}); });
const uid = Date.now().toString() + Math.random().toString(36).substring(2, 9)
const questions = newQuestions ?? [{ answers: [] }]; const questions = newQuestions ?? [{ id: uid ,answers: [] }];
console.log(questions?.[0]?.meta, "questions"); console.log(questions?.[0]?.meta, "questions");
return { return {

View File

@ -283,6 +283,7 @@ export type Exercise = {};
export type Choice = { export type Choice = {
name: string; name: string;
id:number
}; };
export type tags = { export type tags = {