From 1494ec59e466d2bb3e36c8cc7e88cba629224798 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Mon, 20 Dec 2021 20:15:25 +0200
Subject: [PATCH] new node structure
---
.../src/EssayService/EssayService.js | 14 ++++++++++++--
.../schema/{essayNode.js => essayContainerNode.js} | 7 ++++---
.../src/EssayService/schema/essayFeedBackNode.js | 3 +++
.../src/EssayService/schema/essayQuestionNode.js | 3 +++
.../schema/multipleChoiceNode.js | 3 ++-
5 files changed, 24 insertions(+), 6 deletions(-)
rename wax-prosemirror-services/src/EssayService/schema/{essayNode.js => essayContainerNode.js} (84%)
create mode 100644 wax-prosemirror-services/src/EssayService/schema/essayFeedBackNode.js
create mode 100644 wax-prosemirror-services/src/EssayService/schema/essayQuestionNode.js
diff --git a/wax-prosemirror-services/src/EssayService/EssayService.js b/wax-prosemirror-services/src/EssayService/EssayService.js
index ed1e46693..be7bd38ff 100644
--- a/wax-prosemirror-services/src/EssayService/EssayService.js
+++ b/wax-prosemirror-services/src/EssayService/EssayService.js
@@ -1,6 +1,8 @@
import Service from '../Service';
import EssayQuestion from './EssayQuestion';
-import essayNode from './schema/essayNode';
+import essayContainerNode from './schema/essayContainerNode';
+import essayQuestionNode from './schema/essayQuestionNode';
+import essayFeedBackNode from './schema/essayFeedBackNode';
import EssayComponent from './components/EssayComponent';
import EssayNodeView from './EssayNodeView';
@@ -11,7 +13,15 @@ class EssayService extends Service {
const addPortal = this.container.get('AddPortal');
createNode({
- essay: essayNode,
+ essay_container: essayContainerNode,
+ });
+
+ createNode({
+ essay_question: essayQuestionNode,
+ });
+
+ createNode({
+ essay_feedback: essayFeedBackNode,
});
addPortal({
diff --git a/wax-prosemirror-services/src/EssayService/schema/essayNode.js b/wax-prosemirror-services/src/EssayService/schema/essayContainerNode.js
similarity index 84%
rename from wax-prosemirror-services/src/EssayService/schema/essayNode.js
rename to wax-prosemirror-services/src/EssayService/schema/essayContainerNode.js
index 257009cb8..72f12448c 100644
--- a/wax-prosemirror-services/src/EssayService/schema/essayNode.js
+++ b/wax-prosemirror-services/src/EssayService/schema/essayContainerNode.js
@@ -1,9 +1,10 @@
-const essayNode = {
+const essayContainerNode = {
attrs: {
- class: { default: 'essay' },
id: { default: '' },
+ class: { default: 'essay' },
},
group: 'block questions',
+ atom: true,
selectable: true,
draggable: true,
content: 'block+',
@@ -23,4 +24,4 @@ const essayNode = {
},
};
-export default essayNode;
+export default essayContainerNode;
diff --git a/wax-prosemirror-services/src/EssayService/schema/essayFeedBackNode.js b/wax-prosemirror-services/src/EssayService/schema/essayFeedBackNode.js
new file mode 100644
index 000000000..227917bb1
--- /dev/null
+++ b/wax-prosemirror-services/src/EssayService/schema/essayFeedBackNode.js
@@ -0,0 +1,3 @@
+const essayFeedBackNode = {};
+
+export default essayFeedBackNode;
diff --git a/wax-prosemirror-services/src/EssayService/schema/essayQuestionNode.js b/wax-prosemirror-services/src/EssayService/schema/essayQuestionNode.js
new file mode 100644
index 000000000..dcbd78683
--- /dev/null
+++ b/wax-prosemirror-services/src/EssayService/schema/essayQuestionNode.js
@@ -0,0 +1,3 @@
+const essayQuestionNode = {};
+
+export default essayQuestionNode;
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
index a538c33cf..b828697d3 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
@@ -10,7 +10,8 @@ const multipleChoiceNode = {
group: 'block questions',
content: 'block*',
defining: true,
-
+ // selectable: true,
+ // draggable: true,
// atom: true,
parseDOM: [
{
--
GitLab