Merge pull request #10771 from AllanOXDi/finalize_learner_notification

Finalize learner storage notifications
learningequality · Jul 19, 2023 · a17b2ac · a17b2ac
2 parents a1571b7 + 07027d1
commit a17b2ac
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/kolibri/core/assets/src/composables/useUserSyncStatus.js b/kolibri/core/assets/src/composables/useUserSyncStatus.js
@@ -37,7 +37,6 @@ export function pollUserSyncStatusTask() {
   if (!store.state.core.session.user_id) {
     return Promise.resolve();
   }
-
   return fetchUserSyncStatus({ user: store.state.core.session.user_id }).then(syncData => {
     if (syncData && syncData[0]) {
       queued.value = syncData[0].queued;
@@ -59,6 +58,9 @@ export default function useUserSyncStatus() {
   onMounted(() => {
     usageCount.value++;
     if (usageCount.value === 1) {
+      if (store.state.core.session.user_id) {
+        pollUserSyncStatusTask();
+      }
       resume();
     }
   });

diff --git a/kolibri/core/assets/src/views/StorageNotification.vue b/kolibri/core/assets/src/views/StorageNotification.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <div v-if="showBanner" class="banner" :style="{ background: $themeTokens.surface }">
+  <div v-if="bannerOpened" class="banner" :style="{ background: $themeTokens.surface }">
     <div class="banner-inner">
       <h1 style="display: none">
         {{ $tr('bannerHeading') }}
@@ -51,6 +51,8 @@
   import useUser from 'kolibri.coreVue.composables.useUser';
   import { useLocalStorage } from '@vueuse/core';
   import { LearnerDeviceStatus } from 'kolibri.coreVue.vuex.constants';
+  import urls from 'kolibri.urls';
+  import redirectBrowser from 'kolibri.utils.redirectBrowser';
   import useUserSyncStatus from '../composables/useUserSyncStatus';
 
   export default {
@@ -95,7 +97,9 @@
       };
     },
     data() {
-      return {};
+      return {
+        bannerOpened: false,
+      };
     },
     computed: {
       ...mapGetters(['isLearner', 'isAdmin', 'canManageContent']),
@@ -121,6 +125,16 @@
         );
       },
     },
+    watch: {
+      showBanner: {
+        handler(newVal, oldValue) {
+          if (newVal !== oldValue) {
+            this.bannerOpened = newVal;
+          }
+        },
+        deep: true,
+      },
+    },
     mounted() {
       document.addEventListener('focusin', this.focusChange);
     },
@@ -144,14 +158,19 @@
       closeBanner() {
         this.setLastSyncedValue(this.lastSynced);
         this.setDownloadRemovedValue(this.lastDownloadRemoved);
-        this.showBanner = false;
+        this.bannerOpened = false;
 
         if (this.previouslyFocusedElement) {
           this.previouslyFocusedElement.focus();
         }
       },
       manageChannel() {
-        this.$router.push('/');
+        const deviceManagementUrl = urls['kolibri:kolibri.plugins.device:device_management']();
+        if (this.canManageContent && deviceManagementUrl) {
+          redirectBrowser(deviceManagementUrl);
+        } else {
+          this.bannerOpened = false;
+        }
       },
 
       focusChange(e) {