Merge pull request #12158 from AlexVelezLl/fix-facility-sync-elapsedtime

Fix facility sync elapsed time
learningequality · May 14, 2024 · 16cbcae · 16cbcae
2 parents 405b30a + 06546c6
commit 16cbcae
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/kolibri/core/assets/src/views/sync/FacilityNameAndSyncStatus/index.vue b/kolibri/core/assets/src/views/sync/FacilityNameAndSyncStatus/index.vue
@@ -76,13 +76,17 @@
 
 <script>
 
-  import { now } from 'kolibri.utils.serverClock';
+  import useNow from 'kolibri.coreVue.composables.useNow';
   import taskStrings from 'kolibri.coreVue.mixins.commonTaskStrings';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
 
   export default {
     name: 'FacilityNameAndSyncStatus',
     mixins: [taskStrings, commonCoreStrings],
+    setup() {
+      const { now } = useNow();
+      return { now };
+    },
     props: {
       facility: {
         type: Object,
@@ -105,11 +109,6 @@
         required: true,
       },
     },
-    data() {
-      return {
-        now: now(),
-      };
-    },
     computed: {
       syncFailed() {
         const lastSyncFailed =

diff --git a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
@@ -253,11 +253,14 @@
     },
     watch: {
       // Update facilities whenever a watched task completes
-      facilityTasks(newTasks) {
+      facilityTasks(newTasks, prevTasks) {
         for (const index in newTasks) {
           const task = newTasks[index];
           if (this.taskIdsToWatch.includes(task.id)) {
-            if (task.status === TaskStatuses.COMPLETED) {
+            if (
+              task.status === TaskStatuses.COMPLETED ||
+              this.isRepeatingTaskCompleted(task, prevTasks)
+            ) {
               this.fetchFacilites();
               if (task.type === TaskTypes.DELETEFACILITY) {
                 this.showFacilityRemovedSnackbar(task.facility_name);
@@ -284,6 +287,16 @@
         .catch(() => (this.loadingFacilities = false));
     },
     methods: {
+      isRepeatingTaskCompleted(task, prevTasks) {
+        if (!task.repeat_interval) {
+          return false;
+        }
+        const prevTask = prevTasks.find(({ id }) => id === task.id);
+        if (!prevTask) {
+          return false;
+        }
+        return prevTask.status === TaskStatuses.RUNNING && task.status === TaskStatuses.QUEUED;
+      },
       facilityOptions() {
         return [
           {

diff --git a/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue b/kolibri/plugins/facility/assets/src/views/DataPage/SyncInterface/index.vue
@@ -232,8 +232,8 @@
         TaskResource.get(this.syncTaskId).then(task => {
           if (task.clearable) {
             this.isSyncing = false;
-            this.syncTaskId = '';
             TaskResource.clear(this.syncTaskId);
+            this.syncTaskId = '';
             if (task.status === TaskStatuses.FAILED) {
               this.syncHasFailed = true;
             } else if (task.status === TaskStatuses.COMPLETED) {