✨ Add restoring local answer for hparsons directive

Author: zihan21206

package-lock.json

@@ -36,7 +36,7 @@
         "handsontable": "7.2.2",
         "jexcel": "^3.9.1",
         "jquery-ui": "1.10.4",
-        "micro-parsons": "https://github.com/amy21206/micro-parsons-element/releases/download/v0.1.3/micro-parsons-0.1.3.tgz",
+        "micro-parsons": "https://github.com/amy21206/micro-parsons-element/releases/download/v0.1.4/micro-parsons-0.1.4.tgz",
         "select2": "^4.1.0-rc.0",
         "sql.js": "1.5.0",
         "vega-embed": "3.14.0",

package.json

@@ -261,13 +261,10 @@ export default class SQLFeedback extends HParsonsFeedback {
     // adapted from activecode
     async buildProg() {
         // assemble code from prefix, suffix, and editor for running.
-        // TODO: fix or remove text entry
+        // TODO: automatically joins the text array with space. 
+        //       Should be joining without space when implementing regex.
         var prog;
-        if (this.hparsons.textentry) {
-            prog = this.hparsons.hparsonsInput.getCurrentInput();
-        } else {
-            prog = this.hparsons.hparsonsInput.getParsonsTextArray().join(' ') + "\n";
-        }
+        prog = this.hparsons.hparsonsInput.getParsonsTextArray().join(' ') + "\n";
         return Promise.resolve(prog);
     }
 

runestone/hparsons/js/SQLFeedback.js

@@ -76,6 +76,7 @@ export default class HParsons extends RunestoneBase {
 
         // initializing functionalities for different feedback
         this.feedbackController.init();
+        this.checkServer('hparsons', true);
     }
 
     // copied from activecode, already modified to add parsons
@@ -115,7 +116,6 @@ export default class HParsons extends RunestoneBase {
         this.feedbackController.createOutput();
     }
 
-    // copied from activecode
     createControls() {
         var ctrlDiv = document.createElement("div");
         $(ctrlDiv).addClass("hp_actions");
@@ -127,8 +127,10 @@ export default class HParsons extends RunestoneBase {
         ctrlDiv.appendChild(this.runButton);
         $(this.runButton).attr("type", "button");
         $(this.runButton).text("Run");
+        var that = this;
         this.runButton.onclick = () => {
-            this.feedbackController.runButtonHandler();
+            that.feedbackController.runButtonHandler();
+            that.setLocalStorage();
         };
 
         // Reset button
@@ -139,8 +141,9 @@ export default class HParsons extends RunestoneBase {
         ctrlDiv.appendChild(resetBtn);
         this.resetButton = resetBtn;
         this.resetButton.onclick = () => {
-            this.hparsonsInput.resetInput();
-            this.feedbackController.reset();
+            that.hparsonsInput.resetInput();
+            that.setLocalStorage();
+            that.feedbackController.reset();
         };
         $(resetBtn).attr("type", "button");
 
@@ -149,6 +152,7 @@ export default class HParsons extends RunestoneBase {
     }
 
     // Return previous answers in local storage
+    // 
     localData() {
         var data = localStorage.getItem(this.storageId);
         if (data !== null) {
@@ -164,28 +168,39 @@ export default class HParsons extends RunestoneBase {
     }
     // RunestoneBase: Sent when the server has data
     restoreAnswers(serverData) {
-        this.loadData(serverData);
+        if (serverData.answer){
+            this.hparsonsInput.restoreAnswer(serverData.answer);
+        }
     }
     // RunestoneBase: Load what is in local storage
     checkLocalStorage() {
         if (this.graderactive) {
+            // Zihan: I think this means the component is still loading?
             return;
         }
-        this.loadData(this.localData());
+        let localData = this.localData();
+        if (localData.answer) {
+            this.hparsonsInput.restoreAnswer(localData.answer);
+        }
+        if (localData.count) {
+            this.feedbackController.checkCount = localData.count;
+        }
     }
     // RunestoneBase: Set the state of the problem in local storage
     setLocalStorage(data) {
-        var toStore;
+        let currentState = {};
         if (data == undefined) {
-            toStore = {
-                source: this.sourceHash(),
-                answer: this.answerHash(),
-                timestamp: new Date(),
-            };
+            currentState = {
+                answer: this.hparsonsInput.getParsonsTextArray()
+            }
+            if (this.isBlockGrading) {
+                // if this is block grading, add number of previous attempts too
+                currentState.count = this.feedbackController.checkCount;
+            }
         } else {
-            toStore = data;
+            currentState = data;
         }
-        localStorage.setItem(this.storageId, JSON.stringify(toStore));
+        localStorage.setItem(this.storageId, JSON.stringify(currentState));
     }
 
     logHorizontalParsonsEvent(hparsonsEvent) {