From 2317fbda322e9877f8251f7bbf9a76f062b7eb11 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Fri, 3 Dec 2021 15:41:11 +0200 Subject: [PATCH] fix schema --- .../MultipleChoiceQuestion.js | 19 ++++++++++++++----- .../MultipleChoiceSingleCorrectQuestion.js | 19 ++++++++++++++----- ...ultipleChoiceSingleCorrectContainerNode.js | 2 +- .../TrueFalseQuestion.js | 19 ++++++++++++++----- .../schema/trueFalseContainerNode.js | 2 +- .../schema/multipleChoiceContainerNode.js | 2 +- 6 files changed, 45 insertions(+), 18 deletions(-) diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js index 274c9d639..163779b68 100644 --- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js +++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js @@ -35,15 +35,24 @@ const createOption = (main, context) => { ), ); + /* create First Option */ + const firstOption = main.state.config.schema.nodes.multiple_choice.create( + { id: uuidv4() }, + Fragment.empty, + ); + dispatch(main.state.tr.replaceSelectionWith(firstOption)); + setTimeout(() => { + helpers.createEmptyParagraph(context, firstOption.attrs.id); + }, 50); + /* create Second Option */ - const newAnswerId = uuidv4(); - const answerOption = main.state.config.schema.nodes.multiple_choice.create( - { id: newAnswerId }, + const secondOption = main.state.config.schema.nodes.multiple_choice.create( + { id: uuidv4() }, Fragment.empty, ); - dispatch(main.state.tr.replaceSelectionWith(answerOption)); + dispatch(main.state.tr.replaceSelectionWith(secondOption)); setTimeout(() => { - helpers.createEmptyParagraph(context, newAnswerId); + helpers.createEmptyParagraph(context, secondOption.attrs.id); }, 50); }; diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestion.js index eaa9c6528..fda78ebf5 100644 --- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestion.js +++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestion.js @@ -35,15 +35,24 @@ const createOption = (main, context) => { ), ); + /* create First Option */ + const firstOption = main.state.config.schema.nodes.multiple_choice_single_correct.create( + { id: uuidv4() }, + Fragment.empty, + ); + dispatch(main.state.tr.replaceSelectionWith(firstOption)); + setTimeout(() => { + helpers.createEmptyParagraph(context, firstOption.attrs.id); + }, 50); + /* create Second Option */ - const newAnswerId = uuidv4(); - const answerOption = main.state.config.schema.nodes.multiple_choice_single_correct.create( - { id: newAnswerId }, + const secondOption = main.state.config.schema.nodes.multiple_choice_single_correct.create( + { id: uuidv4() }, Fragment.empty, ); - dispatch(main.state.tr.replaceSelectionWith(answerOption)); + dispatch(main.state.tr.replaceSelectionWith(secondOption)); setTimeout(() => { - helpers.createEmptyParagraph(context, newAnswerId); + helpers.createEmptyParagraph(context, secondOption.attrs.id); }, 50); }; diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js index ab224fb26..8113386e8 100644 --- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js +++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js @@ -10,7 +10,7 @@ const multipleChoiceSingleCorrectContainerNode = { atom: true, selectable: true, draggable: true, - content: 'multiple_choice_single_correct+', + content: 'block+', parseDOM: [ { tag: 'div.multiple-choice-single-correct', diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js index d4fe0a311..073a04b9e 100644 --- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js +++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js @@ -35,15 +35,24 @@ const createOption = (main, context) => { ), ); + /* create First Option */ + const firstOption = main.state.config.schema.nodes.true_false.create( + { id: uuidv4() }, + Fragment.empty, + ); + dispatch(main.state.tr.replaceSelectionWith(firstOption)); + setTimeout(() => { + helpers.createEmptyParagraph(context, firstOption.attrs.id); + }, 50); + /* create Second Option */ - const newAnswerId = uuidv4(); - const answerOption = main.state.config.schema.nodes.true_false.create( - { id: newAnswerId }, + const secondOption = main.state.config.schema.nodes.true_false.create( + { id: uuidv4() }, Fragment.empty, ); - dispatch(main.state.tr.replaceSelectionWith(answerOption)); + dispatch(main.state.tr.replaceSelectionWith(secondOption)); setTimeout(() => { - helpers.createEmptyParagraph(context, newAnswerId); + helpers.createEmptyParagraph(context, secondOption.attrs.id); }, 50); }; diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js index 23f5a11e5..c71293a24 100644 --- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js +++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js @@ -7,7 +7,7 @@ const trueFalseContainerNode = { atom: true, selectable: true, draggable: true, - content: 'true_false+', + content: 'block+', parseDOM: [ { tag: 'div.true-false', diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js index 0ac8dba15..b3d00706b 100644 --- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js +++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js @@ -7,7 +7,7 @@ const multipleChoiceContainerNode = { atom: true, selectable: true, draggable: true, - content: 'multiple_choice+', + content: 'block+', parseDOM: [ { tag: 'div.multiple-choice', -- GitLab