Make sure that in-progress resources are up-to-date after navigation

learningequality · Oct 19, 2021 · 48b1c97 · 48b1c97
1 parent 91f439a
commit 48b1c97
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/kolibri/core/assets/src/api-resources/contentNode.js b/kolibri/core/assets/src/api-resources/contentNode.js
@@ -104,8 +104,8 @@ export default new Resource({
   fetchRecommendationsFor(id, getParams) {
     return this.fetchDetailCollection('recommendations_for', id, getParams);
   },
-  fetchResume(getParams) {
-    return this.fetchDetailCollection('resume', Store.getters.currentUserId, getParams);
+  fetchResume(getParams, force) {
+    return this.fetchDetailCollection('resume', Store.getters.currentUserId, getParams, force);
   },
   fetchPopular(getParams) {
     return this.fetchListCollection('popular', getParams);

diff --git a/kolibri/plugins/learn/assets/src/composables/useLearnerResources.js b/kolibri/plugins/learn/assets/src/composables/useLearnerResources.js
@@ -328,18 +328,20 @@ export default function useLearnerResources() {
    * Fetches resumable content nodes with their progress data
    * and saves data to this composable's store
    *
+   * @param {Boolean} force Cache won't be used when `true`
    * @returns {Promise}
    * @public
    */
-  function fetchResumableContentNodes() {
-    return ContentNodeResource.fetchResume().then(contentNodes => {
+  function fetchResumableContentNodes({ force = false } = {}) {
+    return ContentNodeResource.fetchResume({}, force).then(contentNodes => {
       if (!contentNodes || !contentNodes.length) {
         return [];
       }
       set(_resumableContentNodes, contentNodes);
       const contentNodesIds = contentNodes.map(contentNode => contentNode.id);
       return ContentNodeProgressResource.fetchCollection({
         getParams: { ids: contentNodesIds },
+        force,
       }).then(progresses => {
         if (progresses) {
           set(_resumableContentNodesProgresses, progresses);

diff --git a/kolibri/plugins/learn/assets/src/routes/index.js b/kolibri/plugins/learn/assets/src/routes/index.js
@@ -51,8 +51,11 @@ export default [
     component: HomePage,
     handler() {
       let promises = [fetchChannels()];
+      // force resumable content nodes request to make sure that the home
+      // page is up-to-date in regards to in-progress resources
+      // when navigating to other 'Learn' pages and then back to the home page
       if (get(isUserLoggedIn)) {
-        promises = [...promises, fetchClasses(), fetchResumableContentNodes()];
+        promises = [...promises, fetchClasses(), fetchResumableContentNodes({ force: true })];
       }
       return store.dispatch('loading').then(() => {
         return Promise.all(promises)