From c41e73ef8bda99c7d35c2c0ce8fb965e454ec7a4 Mon Sep 17 00:00:00 2001
From: Franco Bulgarelli <franco@mumuki.org>
Date: Thu, 30 Jul 2020 12:41:51 -0300
Subject: [PATCH 1/6] Introducing submission store

---
 .../mumuki_laboratory/application/bridge.js   | 16 +++++-
 .../application/current-exercise.js           | 11 ++++
 .../application/results-renderer.js           |  7 +--
 .../application/submissions-store.js          | 55 +++++++++++++++++++
 app/views/exercises/show.html.erb             |  1 +
 app/views/layouts/_progress_bar.html.erb      |  8 ++-
 6 files changed, 92 insertions(+), 6 deletions(-)
 create mode 100644 app/assets/javascripts/mumuki_laboratory/application/current-exercise.js
 create mode 100644 app/assets/javascripts/mumuki_laboratory/application/submissions-store.js

diff --git a/app/assets/javascripts/mumuki_laboratory/application/bridge.js b/app/assets/javascripts/mumuki_laboratory/application/bridge.js
index 63b01a84c..12a7a5d97 100644
--- a/app/assets/javascripts/mumuki_laboratory/application/bridge.js
+++ b/app/assets/javascripts/mumuki_laboratory/application/bridge.js
@@ -1,14 +1,25 @@
 /**
- * @typedef {{status: string, test_results: [{status: string, title: string}]}} ClientResult
+ * @typedef {{status: SubmissionStatus, test_results: [{status: SubmissionStatus, title: string}]}} ClientResult
  */
 
 /**
  * @typedef {{solution: object, client_result?: ClientResult}} Submission
  */
 
+/**
+ * @typedef {"errored"|"failed"|"passed_with_warnings"|"passed"|"pending"} SubmissionStatus
+ */
+
+/**
+ * @typedef {{content?: {solution: object}, result?: object}} SubmissionAndResult
+ */
+
 var mumuki = mumuki || {};
 
 (function (mumuki) {
+  /**
+   * @type {SubmissionAndResult}
+   */
   var lastSubmission = {};
 
   function Laboratory(exerciseId){
@@ -27,6 +38,9 @@ var mumuki = mumuki || {};
     return lastSubmission.result && lastSubmission.result.status !== 'aborted';
   }
 
+  /**
+   * @param {Submission} submission the submission object
+   */
   function sendNewSolution(submission){
     var token = new mumuki.CsrfToken();
     var request = token.newRequest({
diff --git a/app/assets/javascripts/mumuki_laboratory/application/current-exercise.js b/app/assets/javascripts/mumuki_laboratory/application/current-exercise.js
new file mode 100644
index 000000000..e1ef8ea10
--- /dev/null
+++ b/app/assets/javascripts/mumuki_laboratory/application/current-exercise.js
@@ -0,0 +1,11 @@
+(() => {
+  mumuki.load(() => {
+    // Set global currentExerciseId
+    const $muExerciseId = $('#mu-exercise-id');
+    if ($muExerciseId) {
+      mumuki.currentExerciseId = Number($muExerciseId.val());
+    } else {
+      mumuki.currentExerciseId = null;
+    }
+  })
+})();
diff --git a/app/assets/javascripts/mumuki_laboratory/application/results-renderer.js b/app/assets/javascripts/mumuki_laboratory/application/results-renderer.js
index 90ff77ba2..bb1b3d7cb 100644
--- a/app/assets/javascripts/mumuki_laboratory/application/results-renderer.js
+++ b/app/assets/javascripts/mumuki_laboratory/application/results-renderer.js
@@ -6,7 +6,7 @@
   // ==========================
 
   /**
-   * @param {string} status
+   * @param {SubmissionStatus} status
    * @returns {string}
    */
   function iconForStatus(status) {
@@ -20,8 +20,7 @@
   }
 
   /**
-   *
-   * @param {string} status
+   * @param {SubmissionStatus} status
    * @returns {string}
    */
   function classForStatus(status) {
@@ -36,7 +35,7 @@
 
 
   /**
-   * @param {string} status
+   * @param {SubmissionStatus} status
    * @param {boolean} [active]
    * @returns {string}
    */
diff --git a/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js b/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js
new file mode 100644
index 000000000..8d8a9a185
--- /dev/null
+++ b/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js
@@ -0,0 +1,55 @@
+(() => {
+  const SubmissionsStore = new class {
+    /**
+     * @param {number} exerciseId
+     * @returns {SubmissionStatus}
+     */
+    getLastSubmissionStatus(exerciseId) {
+      const submission = this.getLastSubmission(exerciseId);
+      return submission ? submission.result.status : 'pending';
+    }
+
+    /**
+     * @param {number} exerciseId
+     * @returns {SubmissionAndResult}
+     */
+    getLastSubmission(exerciseId) {
+      const submission = window.localStorage.getItem(this._keyFor(exerciseId));
+      if (!submission) return null;
+      return JSON.parse(submission);
+    }
+
+    /**
+     * @param {number} exerciseId
+     * @param {SubmissionAndResult} submission
+     */
+    setLastSubmission(exerciseId, submission) {
+      window.localStorage.setItem(this._keyFor(exerciseId), this._asString(submission));
+    }
+
+    getCachedResultFor(exerciseId, newSolution) {
+      const lastSubmission = this.getLastSubmission(exerciseId);
+      if (!lastSubmission
+          || lastSubmission.result.status === 'aborted'
+          || !this._solutionEquals(lastSubmission, newSolution)) {
+        return null;
+      }
+      return lastSubmission.result;
+    }
+
+    // private API
+
+    _asString(object) {
+      return JSON.stringify(object);
+    }
+
+    _keyFor(exerciseId) {
+      return `/exercise/${exerciseId}/submission`;
+    }
+
+    _solutionEquals(submission, solution) {
+      return this._asString(submission.content) === this._asString(solution);
+    }
+  };
+  mumuki.SubmissionsStore = SubmissionsStore;
+})();
diff --git a/app/views/exercises/show.html.erb b/app/views/exercises/show.html.erb
index 742b76cbf..782a6f5e9 100644
--- a/app/views/exercises/show.html.erb
+++ b/app/views/exercises/show.html.erb
@@ -45,6 +45,7 @@
 <%= render_exercise_input_layout(@exercise) %>
 
 <%= hidden_field_tag default_content_tag_id(@exercise), @default_content %>
+<%= hidden_field_tag "mu-exercise-id", @exercise.id %>
 
 <div style="display: none" id="processing-template">
   <div class="bs-callout bs-callout-info">
diff --git a/app/views/layouts/_progress_bar.html.erb b/app/views/layouts/_progress_bar.html.erb
index 12f9a00eb..3e499cf4c 100644
--- a/app/views/layouts/_progress_bar.html.erb
+++ b/app/views/layouts/_progress_bar.html.erb
@@ -1,6 +1,12 @@
 <div class="progress-list-flex">
   <% guide.exercises.each do |e| %>
-    <a <%= turbolinks_enable_for e %> href="<%= exercise_path(e)%>" aria-label="<%= e.navigable_name %>" title="<%= e.navigable_name %>" class="<%= class_for_progress_list_item(e, e == actual)%>">
+    <a
+      <%= turbolinks_enable_for e %>
+      href="<%= exercise_path(e)%>"
+      aria-label="<%= e.navigable_name %>"
+      title="<%= e.navigable_name %>"
+      data-mu-exercise-id="<%= e.id %>"
+      class="<%= class_for_progress_list_item(e, e == actual)%>">
     </a>
   <% end %>
 </div>

From 7330e0310c46a61154f8b6b58399dafad5ceadc2 Mon Sep 17 00:00:00 2001
From: Franco Bulgarelli <franco@mumuki.org>
Date: Thu, 30 Jul 2020 17:32:57 -0300
Subject: [PATCH 2/6] Converting bridge to es6

---
 .../mumuki_laboratory/application/bridge.js   | 128 +++++++++---------
 1 file changed, 65 insertions(+), 63 deletions(-)

diff --git a/app/assets/javascripts/mumuki_laboratory/application/bridge.js b/app/assets/javascripts/mumuki_laboratory/application/bridge.js
index 12a7a5d97..669ae017b 100644
--- a/app/assets/javascripts/mumuki_laboratory/application/bridge.js
+++ b/app/assets/javascripts/mumuki_laboratory/application/bridge.js
@@ -1,74 +1,36 @@
 /**
- * @typedef {{status: SubmissionStatus, test_results: [{status: SubmissionStatus, title: string}]}} ClientResult
+ * @typedef {{status: SubmissionStatus, test_results: [{status: SubmissionStatus, title: string}]}} SubmissionClientResult
  */
 
 /**
- * @typedef {{solution: object, client_result?: ClientResult}} Submission
+ * @typedef {{
+ *  status: SubmissionStatus,
+ *  class_for_progress_list_item?: string,
+ *  guide_finished_by_solution?: boolean
+ * }} SubmissionResult
  */
 
 /**
- * @typedef {"errored"|"failed"|"passed_with_warnings"|"passed"|"pending"} SubmissionStatus
+ * @typedef {{solution: object, client_result?: SubmissionClientResult}} Submission
  */
 
 /**
- * @typedef {{content?: {solution: object}, result?: object}} SubmissionAndResult
+ * @typedef {"errored"|"failed"|"passed_with_warnings"|"passed"|"pending"|"aborted"} SubmissionStatus
  */
 
-var mumuki = mumuki || {};
+/**
+ * @typedef {{content?: {solution: object}, result?: SubmissionResult}} SubmissionAndResult
+ */
 
-(function (mumuki) {
+/** @module mumuki.bridge */
+mumuki.bridge = {};
+mumuki.bridge.Laboratory = (() => {
   /**
    * @type {SubmissionAndResult}
    */
   var lastSubmission = {};
 
-  function Laboratory(exerciseId){
-    this.exerciseId = exerciseId;
-  }
-
-  function asString(json){
-    return JSON.stringify(json);
-  }
-
-  function sameAsLastSolution(newSolution){
-    return asString(lastSubmission.content) === asString(newSolution);
-  }
-
-  function lastSubmissionFinishedSuccessfully(){
-    return lastSubmission.result && lastSubmission.result.status !== 'aborted';
-  }
-
-  /**
-   * @param {Submission} submission the submission object
-   */
-  function sendNewSolution(submission){
-    var token = new mumuki.CsrfToken();
-    var request = token.newRequest({
-      type: 'POST',
-      url: window.location.origin + window.location.pathname + '/solutions' + window.location.search,
-      data: submission
-    });
-
-    return $.ajax(request).then(preRenderResult).done(function (result) {
-      lastSubmission = { content: {solution: submission.solution}, result: result };
-    });
-  }
-
-
-  /**
-   * Pre-renders some html parts of submission UI
-   * */
-  function preRenderResult(result) {
-    result.class_for_progress_list_item = mumuki.renderers.progressListItemClassForStatus(result.status, true)
-    return result;
-  }
-
-  mumuki.load(function () {
-    lastSubmission = {};
-  });
-
-  Laboratory.prototype = {
-
+  class Laboratory {
     // ==========
     // Public API
     // ==========
@@ -79,9 +41,9 @@ var mumuki = mumuki || {};
      *
      * @param {object} content the content object
      * */
-    runTests: function(content) {
+    runTests(content) {
       return this._submitSolution({ solution: content });
-    },
+    }
 
     // ===========
     // Private API
@@ -92,17 +54,57 @@ var mumuki = mumuki || {};
      *
      * @param {Submission} submission the submission object
      */
-    _submitSolution: function (submission) {
-      if(lastSubmissionFinishedSuccessfully() && sameAsLastSolution(submission)){
+    _submitSolution(submission) {
+      if(this._lastSubmissionFinishedSuccessfully() && this._sameAsLastSolution(submission)){
         return $.Deferred().resolve(lastSubmission.result);
       } else {
-        return sendNewSolution(submission);
+        return this._sendNewSolution(submission);
       }
     }
-  };
 
-  mumuki.bridge = {
-    Laboratory: Laboratory
-  };
+    _asString(json){
+      return JSON.stringify(json);
+    }
+
+    _sameAsLastSolution(newSolution){
+      return this._asString(lastSubmission.content) === this._asString(newSolution);
+    }
+
+    _lastSubmissionFinishedSuccessfully() {
+      return lastSubmission.result && lastSubmission.result.status !== 'aborted';
+    }
+
+    /**
+     * @param {Submission} submission the submission object
+     */
+    _sendNewSolution(submission){
+      var token = new mumuki.CsrfToken();
+      var request = token.newRequest({
+        type: 'POST',
+        url: window.location.origin + window.location.pathname + '/solutions' + window.location.search,
+        data: submission
+      });
+
+      return $.ajax(request).then((result) => this._preRenderResult(result)).done(function (result) {
+        lastSubmission = { content: {solution: submission.solution}, result: result };
+      });
+    }
+
+    /**
+     * Pre-renders some html parts of submission UI, adding them to the given result
+     *
+     * @param {SubmissionResult} result
+     * @returns {SubmissionResult}
+     */
+    _preRenderResult(result) {
+      result.class_for_progress_list_item = mumuki.renderers.progressListItemClassForStatus(result.status, true)
+      return result;
+    }
+  }
+
+  mumuki.load(() => {
+    lastSubmission = {};
+  });
 
-}(mumuki));
+  return Laboratory;
+})();

From 5bc98e45e239cbe3b35d7c05ae3dc66a91991948 Mon Sep 17 00:00:00 2001
From: Franco Bulgarelli <franco@mumuki.org>
Date: Thu, 30 Jul 2020 17:34:50 -0300
Subject: [PATCH 3/6] Adding more type information

---
 .../mumuki_laboratory/application/current-exercise.js          | 2 ++
 .../javascripts/mumuki_laboratory/application/submission.js    | 3 +++
 jsconfig.json                                                  | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/mumuki_laboratory/application/current-exercise.js b/app/assets/javascripts/mumuki_laboratory/application/current-exercise.js
index e1ef8ea10..6f8837e20 100644
--- a/app/assets/javascripts/mumuki_laboratory/application/current-exercise.js
+++ b/app/assets/javascripts/mumuki_laboratory/application/current-exercise.js
@@ -1,3 +1,5 @@
+/** @type {number} */
+mumuki.currentExerciseId = null;
 (() => {
   mumuki.load(() => {
     // Set global currentExerciseId
diff --git a/app/assets/javascripts/mumuki_laboratory/application/submission.js b/app/assets/javascripts/mumuki_laboratory/application/submission.js
index fc6b020aa..81357e25d 100644
--- a/app/assets/javascripts/mumuki_laboratory/application/submission.js
+++ b/app/assets/javascripts/mumuki_laboratory/application/submission.js
@@ -82,6 +82,8 @@ var mumuki = mumuki || {};
    *
    * This method will use CustomEditor's sources if availble, or
    * standard editor's content sources otherwise
+   *
+   * @returns {Submission}
    */
   function getContent() {
     let content = {};
@@ -97,6 +99,7 @@ var mumuki = mumuki || {};
       content[it.name] = it.value;
     });
 
+    // @ts-ignore
     return content;
   }
 
diff --git a/jsconfig.json b/jsconfig.json
index 906ce14b5..6c8734780 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
+    "module": "none",
     "target": "es6",
     "checkJs": true,
     "allowSyntheticDefaultImports": true

From cbbf016652a2dec0252042e61e8d97875e8f37fb Mon Sep 17 00:00:00 2001
From: Franco Bulgarelli <franco@mumuki.org>
Date: Thu, 30 Jul 2020 19:52:37 -0300
Subject: [PATCH 4/6] Using SubmissionsStore

---
 .../mumuki_laboratory/application/bridge.js   | 48 ++++++++-----------
 .../application/submissions-store.js          |  6 +++
 2 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/app/assets/javascripts/mumuki_laboratory/application/bridge.js b/app/assets/javascripts/mumuki_laboratory/application/bridge.js
index 669ae017b..c6279cb3f 100644
--- a/app/assets/javascripts/mumuki_laboratory/application/bridge.js
+++ b/app/assets/javascripts/mumuki_laboratory/application/bridge.js
@@ -22,13 +22,7 @@
  * @typedef {{content?: {solution: object}, result?: SubmissionResult}} SubmissionAndResult
  */
 
-/** @module mumuki.bridge */
-mumuki.bridge = {};
-mumuki.bridge.Laboratory = (() => {
-  /**
-   * @type {SubmissionAndResult}
-   */
-  var lastSubmission = {};
+mumuki.bridge = (() => {
 
   class Laboratory {
     // ==========
@@ -53,25 +47,26 @@ mumuki.bridge.Laboratory = (() => {
      * Sends a solution object
      *
      * @param {Submission} submission the submission object
+     * @returns {JQuery.Promise<SubmissionResult>}
      */
     _submitSolution(submission) {
-      if(this._lastSubmissionFinishedSuccessfully() && this._sameAsLastSolution(submission)){
-        return $.Deferred().resolve(lastSubmission.result);
+      const lastSubmission = mumuki.SubmissionsStore.getCachedResultFor(mumuki.currentExerciseId, submission);
+      if(lastSubmission){
+        return $.Deferred().resolve(lastSubmission);
       } else {
-        return this._sendNewSolution(submission);
+        return this._sendNewSolution(submission).done(function (result) {
+          mumuki.SubmissionsStore.setLastSubmission(mumuki.currentExerciseId, this._buildLastSubmission(submission, result));
+        });
       }
     }
 
-    _asString(json){
-      return JSON.stringify(json);
-    }
-
-    _sameAsLastSolution(newSolution){
-      return this._asString(lastSubmission.content) === this._asString(newSolution);
-    }
-
-    _lastSubmissionFinishedSuccessfully() {
-      return lastSubmission.result && lastSubmission.result.status !== 'aborted';
+    /**
+     * @param {Submission} submission
+     * @param {SubmissionResult} result
+     * @returns {SubmissionAndResult}
+     */
+    _buildLastSubmission(submission, result) {
+      return { content: {solution: submission.solution}, result: result }
     }
 
     /**
@@ -84,10 +79,7 @@ mumuki.bridge.Laboratory = (() => {
         url: window.location.origin + window.location.pathname + '/solutions' + window.location.search,
         data: submission
       });
-
-      return $.ajax(request).then((result) => this._preRenderResult(result)).done(function (result) {
-        lastSubmission = { content: {solution: submission.solution}, result: result };
-      });
+      return $.ajax(request).then((result) => this._preRenderResult(result));
     }
 
     /**
@@ -102,9 +94,7 @@ mumuki.bridge.Laboratory = (() => {
     }
   }
 
-  mumuki.load(() => {
-    lastSubmission = {};
-  });
-
-  return Laboratory;
+  return {
+    Laboratory
+  };
 })();
diff --git a/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js b/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js
index 8d8a9a185..85d8e20e1 100644
--- a/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js
+++ b/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js
@@ -27,6 +27,12 @@
       window.localStorage.setItem(this._keyFor(exerciseId), this._asString(submission));
     }
 
+    /**
+     *
+     * @param {number} exerciseId
+     * @param {*} newSolution
+     * @returns {SubmissionResult}
+     */
     getCachedResultFor(exerciseId, newSolution) {
       const lastSubmission = this.getLastSubmission(exerciseId);
       if (!lastSubmission

From 6c65385dc1597913ae496d5078484f34cb9b6985 Mon Sep 17 00:00:00 2001
From: Franco Bulgarelli <franco@mumuki.org>
Date: Fri, 31 Jul 2020 12:06:04 -0300
Subject: [PATCH 5/6] Fixing this

---
 app/assets/javascripts/mumuki_laboratory/application/bridge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/mumuki_laboratory/application/bridge.js b/app/assets/javascripts/mumuki_laboratory/application/bridge.js
index c6279cb3f..7a8fa7a34 100644
--- a/app/assets/javascripts/mumuki_laboratory/application/bridge.js
+++ b/app/assets/javascripts/mumuki_laboratory/application/bridge.js
@@ -54,7 +54,7 @@ mumuki.bridge = (() => {
       if(lastSubmission){
         return $.Deferred().resolve(lastSubmission);
       } else {
-        return this._sendNewSolution(submission).done(function (result) {
+        return this._sendNewSolution(submission).done((result) => {
           mumuki.SubmissionsStore.setLastSubmission(mumuki.currentExerciseId, this._buildLastSubmission(submission, result));
         });
       }

From 0a5b4f5bce7ec5617831a9a2fe0ac9ed6ecd8b57 Mon Sep 17 00:00:00 2001
From: Franco Bulgarelli <franco@mumuki.org>
Date: Fri, 31 Jul 2020 15:27:21 -0300
Subject: [PATCH 6/6] Improving types, naming and delegation

---
 .../mumuki_laboratory/application/bridge.js   | 39 +++++++------
 .../application/submissions-store.js          | 56 +++++++++++++------
 2 files changed, 61 insertions(+), 34 deletions(-)

diff --git a/app/assets/javascripts/mumuki_laboratory/application/bridge.js b/app/assets/javascripts/mumuki_laboratory/application/bridge.js
index 7a8fa7a34..7e2f9efe3 100644
--- a/app/assets/javascripts/mumuki_laboratory/application/bridge.js
+++ b/app/assets/javascripts/mumuki_laboratory/application/bridge.js
@@ -1,25 +1,36 @@
 /**
- * @typedef {{status: SubmissionStatus, test_results: [{status: SubmissionStatus, title: string}]}} SubmissionClientResult
+ * @typedef {"errored"|"failed"|"passed_with_warnings"|"passed"|"pending"|"aborted"} SubmissionStatus
  */
 
 /**
  * @typedef {{
  *  status: SubmissionStatus,
- *  class_for_progress_list_item?: string,
- *  guide_finished_by_solution?: boolean
- * }} SubmissionResult
+ *  test_results: [{status: SubmissionStatus, title: string}]
+ * }} SubmissionClientResult
  */
 
 /**
- * @typedef {{solution: object, client_result?: SubmissionClientResult}} Submission
+ * @typedef {{
+  *  status: SubmissionStatus,
+  *  class_for_progress_list_item?: string,
+  *  guide_finished_by_solution?: boolean
+  * }} SubmissionResult
+  */
+
+/**
+ * @typedef {object} Solution
  */
 
 /**
- * @typedef {"errored"|"failed"|"passed_with_warnings"|"passed"|"pending"|"aborted"} SubmissionStatus
+ * @typedef {{
+ *  "solution[content]"?:string,
+ *  solution?: Solution,
+ *  client_result?: SubmissionClientResult
+ * }} Submission
  */
 
 /**
- * @typedef {{content?: {solution: object}, result?: SubmissionResult}} SubmissionAndResult
+ * @typedef {{submission?: Submission, result?: SubmissionResult}} SubmissionAndResult
  */
 
 mumuki.bridge = (() => {
@@ -51,26 +62,18 @@ mumuki.bridge = (() => {
      */
     _submitSolution(submission) {
       const lastSubmission = mumuki.SubmissionsStore.getCachedResultFor(mumuki.currentExerciseId, submission);
-      if(lastSubmission){
+      if (lastSubmission) {
         return $.Deferred().resolve(lastSubmission);
       } else {
         return this._sendNewSolution(submission).done((result) => {
-          mumuki.SubmissionsStore.setLastSubmission(mumuki.currentExerciseId, this._buildLastSubmission(submission, result));
+          mumuki.SubmissionsStore.setLastSubmission(mumuki.currentExerciseId, {submission, result});
         });
       }
     }
 
-    /**
-     * @param {Submission} submission
-     * @param {SubmissionResult} result
-     * @returns {SubmissionAndResult}
-     */
-    _buildLastSubmission(submission, result) {
-      return { content: {solution: submission.solution}, result: result }
-    }
-
     /**
      * @param {Submission} submission the submission object
+     * @returns {JQuery.Promise<SubmissionResult>}
      */
     _sendNewSolution(submission){
       var token = new mumuki.CsrfToken();
diff --git a/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js b/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js
index 85d8e20e1..f1ed2d703 100644
--- a/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js
+++ b/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js
@@ -1,4 +1,4 @@
-(() => {
+mumuki.SubmissionsStore = (() => {
   const SubmissionsStore = new class {
     /**
      * @param {number} exerciseId
@@ -14,35 +14,62 @@
      * @returns {SubmissionAndResult}
      */
     getLastSubmission(exerciseId) {
-      const submission = window.localStorage.getItem(this._keyFor(exerciseId));
-      if (!submission) return null;
-      return JSON.parse(submission);
+      const submissionAndResult = window.localStorage.getItem(this._keyFor(exerciseId));
+      if (!submissionAndResult) return null;
+      return JSON.parse(submissionAndResult);
     }
 
     /**
      * @param {number} exerciseId
-     * @param {SubmissionAndResult} submission
+     * @param {SubmissionAndResult} submissionAndResult
      */
-    setLastSubmission(exerciseId, submission) {
-      window.localStorage.setItem(this._keyFor(exerciseId), this._asString(submission));
+    setLastSubmission(exerciseId, submissionAndResult) {
+      window.localStorage.setItem(this._keyFor(exerciseId), this._asString(submissionAndResult));
     }
 
     /**
+     * Retrieves the last cached, non-aborted result for the given submission
      *
      * @param {number} exerciseId
-     * @param {*} newSolution
-     * @returns {SubmissionResult}
+     * @param {Submission} submission
+     * @returns {SubmissionResult} the cached result for this submission
      */
-    getCachedResultFor(exerciseId, newSolution) {
+    getCachedResultFor(exerciseId, submission) {
       const lastSubmission = this.getLastSubmission(exerciseId);
       if (!lastSubmission
           || lastSubmission.result.status === 'aborted'
-          || !this._solutionEquals(lastSubmission, newSolution)) {
+          || !this.submissionSolutionEquals(lastSubmission.submission, submission)) {
         return null;
       }
       return lastSubmission.result;
     }
 
+     /**
+     * Extract the submission's solution content
+     *
+     * @param {Submission} submission
+     * @returns {string}
+     */
+    submissionSolutionContent(submission) {
+      if (submission.solution) {
+        return submission.solution.content;
+      } else {
+        return submission['solution[content]'];
+      }
+    }
+
+    /**
+     * Compares two solutions to determine if they are equivalent
+     * from the point of view of the code evaluation
+     *
+     * @param {Submission} one
+     * @param {Submission} other
+     * @returns {boolean}
+     */
+    submissionSolutionEquals(one, other) {
+      return this.submissionSolutionContent(one) === this.submissionSolutionContent(other);
+    }
+
     // private API
 
     _asString(object) {
@@ -52,10 +79,7 @@
     _keyFor(exerciseId) {
       return `/exercise/${exerciseId}/submission`;
     }
-
-    _solutionEquals(submission, solution) {
-      return this._asString(submission.content) === this._asString(solution);
-    }
   };
-  mumuki.SubmissionsStore = SubmissionsStore;
+
+  return SubmissionsStore;
 })();