From 83acc741f5355d1ee976ba6c637afe74e9bb5189 Mon Sep 17 00:00:00 2001
From: Jesper Hodge <19345795+jesperhodge@users.noreply.github.com>
Date: Wed, 25 Jan 2023 15:02:35 -0500
Subject: [PATCH] fix  remove problem placeholder answer text (#215)

* refactor: rename hook correctly

* fix: problem templates
---
 .../EditProblemView/AnswerWidget/AnswerOption.jsx         | 2 +-
 .../components/EditProblemView/AnswerWidget/hook.test.js  | 6 +++---
 .../components/EditProblemView/AnswerWidget/hooks.js      | 4 ++--
 src/editors/data/constants/basicOlxTemplates/dropdown.js  | 8 ++++----
 .../data/constants/basicOlxTemplates/multiSelect.js       | 7 +++----
 src/editors/data/constants/basicOlxTemplates/numeric.js   | 2 +-
 .../data/constants/basicOlxTemplates/singleSelect.js      | 6 +++---
 src/editors/data/constants/basicOlxTemplates/textInput.js | 4 ++--
 8 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/AnswerOption.jsx b/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/AnswerOption.jsx
index 02e283ef0..fead9b3fd 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/AnswerOption.jsx
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/AnswerOption.jsx
@@ -28,7 +28,7 @@ export const AnswerOption = ({
   const dispatch = useDispatch();
   const removeAnswer = hooks.removeAnswer({ answer, dispatch });
   const setAnswer = hooks.setAnswer({ answer, hasSingleAnswer, dispatch });
-  const { isFeedbackVisible, toggleFeedback } = hooks.prepareFeedback(answer);
+  const { isFeedbackVisible, toggleFeedback } = hooks.useFeedback(answer);
 
   return (
     <Collapsible.Advanced
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/hook.test.js b/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/hook.test.js
index ff5d51abe..f5e34dfbd 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/hook.test.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/hook.test.js
@@ -36,16 +36,16 @@ describe('Answer Options Hooks', () => {
   describe('state hooks', () => {
     state.testGetter(state.keys.isFeedbackVisible);
   });
-  describe('prepareFeedback hook', () => {
+  describe('useFeedback hook', () => {
     beforeEach(() => { state.mock(); });
     afterEach(() => { state.restore(); });
     test('test default state is false', () => {
-      output = module.prepareFeedback(answerWithOnlyFeedback);
+      output = module.useFeedback(answerWithOnlyFeedback);
       expect(output.isFeedbackVisible).toBeFalsy();
     });
     test('when useEffect triggers, isFeedbackVisible is set to true', () => {
       const key = state.keys.isFeedbackVisible;
-      output = module.prepareFeedback(answerWithOnlyFeedback);
+      output = module.useFeedback(answerWithOnlyFeedback);
       expect(state.setState[key]).not.toHaveBeenCalled();
       const [cb, prereqs] = useEffect.mock.calls[0];
       expect(prereqs[0]).toStrictEqual(answerWithOnlyFeedback);
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/hooks.js b/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/hooks.js
index 74f141637..9a4cfe6c1 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/hooks.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/hooks.js
@@ -16,7 +16,7 @@ export const setAnswer = ({ answer, hasSingleAnswer, dispatch }) => (payload) =>
   dispatch(actions.problem.updateAnswer({ id: answer.id, hasSingleAnswer, ...payload }));
 };
 
-export const prepareFeedback = (answer) => {
+export const useFeedback = (answer) => {
   const [isFeedbackVisible, setIsFeedbackVisible] = module.state.isFeedbackVisible(false);
   useEffect(() => {
     // Show feedback fields if feedback is present
@@ -55,5 +55,5 @@ export const useAnswerContainer = ({ answers, updateField }) => {
 };
 
 export default {
-  state, removeAnswer, setAnswer, prepareFeedback, isSingleAnswerProblem, useAnswerContainer,
+  state, removeAnswer, setAnswer, useFeedback, isSingleAnswerProblem, useAnswerContainer,
 };
diff --git a/src/editors/data/constants/basicOlxTemplates/dropdown.js b/src/editors/data/constants/basicOlxTemplates/dropdown.js
index 9fa1853a1..06a3cf835 100644
--- a/src/editors/data/constants/basicOlxTemplates/dropdown.js
+++ b/src/editors/data/constants/basicOlxTemplates/dropdown.js
@@ -3,11 +3,11 @@ export const dropdown = `<problem>
 <optionresponse>
   <p>Enter your question</p>
 <optioninput>
-    <option correct="False">an incorrect answer</option>
-    <option correct="True">the correct answer</option>
-    <option correct="False">an incorrect answer</option>
+    <option correct="True"></option>
+    <option correct="False"></option>
+    <option correct="False"></option>
   </optioninput>
 </optionresponse>
 </problem>`
 
-export default dropdown;
\ No newline at end of file
+export default dropdown;
diff --git a/src/editors/data/constants/basicOlxTemplates/multiSelect.js b/src/editors/data/constants/basicOlxTemplates/multiSelect.js
index 4e439917b..5497b318f 100644
--- a/src/editors/data/constants/basicOlxTemplates/multiSelect.js
+++ b/src/editors/data/constants/basicOlxTemplates/multiSelect.js
@@ -3,10 +3,9 @@
 <choiceresponse>
 <p>Enter your question</p>
 <checkboxgroup>
-    <choice correct="true">a correct answer</choice>
-    <choice correct="false">an incorrect answer</choice>
-    <choice correct="false">an incorrect answer</choice>
-    <choice correct="true">a correct answer</choice>
+    <choice correct="true"></choice>
+    <choice correct="false"></choice>
+    <choice correct="false"></choice>
   </checkboxgroup>
 </choiceresponse>
 </problem>`
diff --git a/src/editors/data/constants/basicOlxTemplates/numeric.js b/src/editors/data/constants/basicOlxTemplates/numeric.js
index 22a3f7852..1f7947cb3 100644
--- a/src/editors/data/constants/basicOlxTemplates/numeric.js
+++ b/src/editors/data/constants/basicOlxTemplates/numeric.js
@@ -1,6 +1,6 @@
 /* eslint-disable */
 export const numeric = `<problem>
-<numericalresponse answer="100">
+<numericalresponse>
 <p>Enter your question</p>
 <responseparam type="tolerance" default="5"/>
   <formulaequationinput/>
diff --git a/src/editors/data/constants/basicOlxTemplates/singleSelect.js b/src/editors/data/constants/basicOlxTemplates/singleSelect.js
index de402b531..6794ae60a 100644
--- a/src/editors/data/constants/basicOlxTemplates/singleSelect.js
+++ b/src/editors/data/constants/basicOlxTemplates/singleSelect.js
@@ -3,9 +3,9 @@ export const singleSelect = `<problem>
 <multiplechoiceresponse>
 <p>Enter your question</p>
     <choicegroup>
-        <choice correct="false">an incorrect answer</choice>
-        <choice correct="true">the correct answer</choice>
-        <choice correct="false">an incorrect answer</choice>
+        <choice correct="true"></choice>
+        <choice correct="false"></choice>
+        <choice correct="false"></choice>
     </choicegroup>
 </multiplechoiceresponse>
 </problem>`
diff --git a/src/editors/data/constants/basicOlxTemplates/textInput.js b/src/editors/data/constants/basicOlxTemplates/textInput.js
index ceee90835..07eafc813 100644
--- a/src/editors/data/constants/basicOlxTemplates/textInput.js
+++ b/src/editors/data/constants/basicOlxTemplates/textInput.js
@@ -1,8 +1,8 @@
 /* eslint-disable */
 const textInput =`<problem>
-<stringresponse answer="the correct answer" type="ci">
+<stringresponse type="ci">
 <p>Enter your question</p>
-<additional_answer answer="optional acceptable variant of the correct answer"/>
+<additional_answer />
   <textline size="20"/>
 </stringresponse>
 </problem>`