removing matching toolgroup

editors/demo/src/HHMI/config/config.js

@@ -23,11 +23,10 @@ import {
   MultipleChoiceQuestionService,
   FillTheGapQuestionService,
   FillTheGapToolGroupService,
-  MultipleChoiceDropDownToolGroupService,
+  QuestionsDropDownToolGroupService,
   EssayService,
   EssayToolGroupService,
   MatchingService,
-  MatchingToolGroupService,
   MultipleDropDownService,
   MultipleDropDownToolGroupService,
 } from 'wax-prosemirror-services';
@@ -55,11 +54,10 @@ export default {
         'Lists',
         'Images',
         'Tables',
-        'MultipleChoiceDropDown',
+        'QuestionsDropDown',
         'Essay',
         'FillTheGap',
         'MultipleDropDown',
-        'Matching',
         'FullScreen',
       ],
     },
@@ -72,11 +70,10 @@ export default {
 
   services: [
     new MatchingService(),
-    new MatchingToolGroupService(),
     new FillTheGapQuestionService(),
     new FillTheGapToolGroupService(),
     new MultipleChoiceQuestionService(),
-    new MultipleChoiceDropDownToolGroupService(),
+    new QuestionsDropDownToolGroupService(),
     new MultipleDropDownService(),
     new MultipleDropDownToolGroupService(),
     new EssayService(),

wax-prosemirror-services/index.js

@@ -63,9 +63,8 @@ export { default as TrackCommentOptionsToolGroupService } from './src/WaxToolGro
 export { default as CustomTagInlineToolGroupService } from './src/WaxToolGroups/CustomTagToolGroupService/CustomTagInlineToolGroupService/CustomTagInlineToolGroupService';
 export { default as CustomTagBlockToolGroupService } from './src/WaxToolGroups/CustomTagToolGroupService/CustomTagBlockToolGroupService/CustomTagBlockToolGroupService';
 export { default as FillTheGapToolGroupService } from './src/WaxToolGroups/FillTheGapToolGroupService/FillTheGapToolGroupService';
-export { default as MultipleChoiceDropDownToolGroupService } from './src/WaxToolGroups/MultipleChoiceDropDownToolGroupService/MultipleChoiceDropDownToolGroupService';
+export { default as QuestionsDropDownToolGroupService } from './src/WaxToolGroups/QuestionsDropDownToolGroupService/QuestionsDropDownToolGroupService';
 export { default as EssayToolGroupService } from './src/WaxToolGroups/EssayToolGroupService/EssayToolGroupService';
-export { default as MatchingToolGroupService } from './src/WaxToolGroups/MatchingToolGroupService/MatchingToolGroupService';
 export { default as MultipleDropDownToolGroupService } from './src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDownToolGroupService';
 export { default as OENContainersToolGroupService } from './src/WaxToolGroups/OENContainersToolGroupService/OENContainersToolGroupService';
 export { default as OENLeftToolGroupService } from './src/WaxToolGroups/OENLeftToolGroupService/OENLeftToolGroupService';

wax-prosemirror-services/src/WaxToolGroups/MatchingToolGroupService/Matching.js

-import { injectable, inject } from 'inversify';
-import { ToolGroup } from 'wax-prosemirror-core';
-
-@injectable()
-class Matching extends ToolGroup {
-  tools = [];
-  constructor(@inject('MatchingQuestion') matchingQuestion) {
-    super();
-    this.tools = [matchingQuestion];
-  }
-}
-
-export default Matching;

wax-prosemirror-services/src/WaxToolGroups/MatchingToolGroupService/MatchingToolGroupService.js

-import { Service } from 'wax-prosemirror-core';
-import Matching from './Matching';
-
-class MatchingToolGroupService extends Service {
-  register() {
-    this.container.bind('Matching').to(Matching);
-  }
-}
-
-export default MatchingToolGroupService;

wax-prosemirror-services/src/WaxToolGroups/MultipleChoiceDropDownToolGroupService/MultipleChoiceDropDownToolGroupService.js

-import { Service } from 'wax-prosemirror-core';
-import MultipleChoiceDropDown from './MultipleChoiceDropDown';
-
-class MultipleChoiceDropDownToolGroupService extends Service {
-  register() {
-    this.container.bind('MultipleChoiceDropDown').to(MultipleChoiceDropDown);
-  }
-}
-
-export default MultipleChoiceDropDownToolGroupService;

wax-prosemirror-services/src/WaxToolGroups/MultipleChoiceDropDownToolGroupService/DropDownComponent.js → wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js

@@ -73,6 +73,11 @@ const DropDownComponent = ({ title, view, tools }) => {
       value: '3',
       item: tools[3],
     },
+    {
+      label: 'Matching',
+      value: '4',
+      item: tools[4],
+    },
   ];
 
   useEffect(() => {

wax-prosemirror-services/src/WaxToolGroups/MultipleChoiceDropDownToolGroupService/MultipleChoiceDropDown.js → wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/QuestionsDropDown.js

@@ -6,7 +6,7 @@ import { ToolGroup } from 'wax-prosemirror-core';
 import DropDownComponent from './DropDownComponent';
 
 @injectable()
-class MultipleChoiceDropDown extends ToolGroup {
+class QuestionsDropDown extends ToolGroup {
   tools = [];
   constructor(
     @inject('MultipleChoiceQuestion') multipleChoiceQuestion,
@@ -14,6 +14,7 @@ class MultipleChoiceDropDown extends ToolGroup {
     multipleChoiceSingleCorrectQuestion,
     @inject('TrueFalseQuestion') trueFalseQuestion,
     @inject('TrueFalseSingleCorrectQuestion') trueFalseSingleCorrectQuestion,
+    @inject('MatchingQuestion') matchingQuestion,
   ) {
     super();
     this.tools = [
@@ -21,6 +22,7 @@ class MultipleChoiceDropDown extends ToolGroup {
       multipleChoiceSingleCorrectQuestion,
       trueFalseQuestion,
       trueFalseSingleCorrectQuestion,
+      matchingQuestion,
     ];
   }
 
@@ -36,4 +38,4 @@ class MultipleChoiceDropDown extends ToolGroup {
   }
 }
 
-export default MultipleChoiceDropDown;
+export default QuestionsDropDown;

wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/QuestionsDropDownToolGroupService.js

+import { Service } from 'wax-prosemirror-core';
+import QuestionsDropDown from './QuestionsDropDown';
+
+class QuestionsDropDownToolGroupService extends Service {
+  register() {
+    this.container.bind('QuestionsDropDown').to(QuestionsDropDown);
+  }
+}
+
+export default QuestionsDropDownToolGroupService;