Skip to content

(SBL-633) Fix: Remove modal after create lesson #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vitalikprac wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

(SBL-633) Fix: Remove modal after create lesson #414

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions front/src/pages/Teacher/LessonEdit/LessonEdit.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ const LessonEdit = () => {
const editorJSRef = useRef(null);
const [dataBlocks, setDataBlocks] = useState(null);
const undoPluginRef = useRef(null);
const createdLessonBlocks = useRef(null);
const currentLocation = useMemo(
() => LESSONS_EDIT.replace(':id', lessonId),
[lessonId],
Expand Down Expand Up @@ -89,12 +90,14 @@ const LessonEdit = () => {

const createLessonMutation = useMutation(createLesson, {
onSuccess: (data) => {
const { id } = data?.lesson;
const { id, blocks } = data?.lesson || {};
history.replace(LESSONS_EDIT.replace(':id', id), { forceSkip: true });
message.success({
content: t('editor_js.message.success_created'),
duration: 2,
});
createdLessonBlocks.current = blocks;
setCurrentBlocks(blocks);
},
onError: () => {
message.error({
Expand Down Expand Up @@ -250,7 +253,9 @@ const LessonEdit = () => {
};

const isBlocksChanged = useCallback(() => {
const oldBlocks = prepareEditorData(lessonData?.lesson?.blocks);
const oldBlocks =
prepareEditorData(lessonData?.lesson?.blocks) ||
createdLessonBlocks.current;
// TODO: Compare with fast-deep-equal after adding this library
return JSON.stringify(oldBlocks) !== JSON.stringify(currentBlocks);
}, [currentBlocks, lessonData?.lesson?.blocks]);
Expand Down