Merge pull request #8646 from rtibbles/more_progress

Properly fetch more progress for tree data.
learningequality · Nov 10, 2021 · df6356d · df6356d
2 parents cc3e672 + 732dceb
commit df6356d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/kolibri/plugins/learn/assets/src/composables/useContentNodeProgress.js b/kolibri/plugins/learn/assets/src/composables/useContentNodeProgress.js
@@ -43,7 +43,7 @@ export default function useContentNodeProgress() {
    * @returns {Promise}
    * @public
    */
-  function fetchContentNodeTreeProgress(id, params) {
+  function fetchContentNodeTreeProgress({ id, params }) {
     return ContentNodeProgressResource.fetchTree({
       params,
       id,

diff --git a/kolibri/plugins/learn/assets/src/modules/topicsTree/handlers.js b/kolibri/plugins/learn/assets/src/modules/topicsTree/handlers.js
@@ -43,7 +43,7 @@ export function showTopicsTopic(store, { id, pageName }) {
         store.getters.isAdmin || store.getters.isCoach || store.getters.isSuperuser,
     };
     if (store.getters.isUserLoggedIn) {
-      fetchContentNodeTreeProgress(id, params);
+      fetchContentNodeTreeProgress({ id, params });
     }
     return ContentNodeResource.fetchTree({
       id,

diff --git a/kolibri/plugins/learn/assets/src/modules/topicsTree/index.js b/kolibri/plugins/learn/assets/src/modules/topicsTree/index.js
@@ -43,7 +43,9 @@ export default {
     loadMoreTopics(store) {
       const more = store.state.topic.children.more;
       if (more) {
-        fetchContentNodeTreeProgress(more);
+        if (store.rootGetters.isUserLoggedIn) {
+          fetchContentNodeTreeProgress(more);
+        }
         return ContentNodeResource.fetchTree(more)
           .then(data => {
             store.commit('ADD_MORE_CONTENTS', data);
@@ -58,7 +60,9 @@ export default {
       const parent = parentIndex > -1 ? store.state.contents[parentIndex] : null;
       const more = parent && parent.children && parent.children.more;
       if (more) {
-        fetchContentNodeTreeProgress(more);
+        if (store.rootGetters.isUserLoggedIn) {
+          fetchContentNodeTreeProgress(more);
+        }
         return ContentNodeResource.fetchTree(more)
           .then(data => {
             data.index = parentIndex;