Fix task polling overriding user input

Author: AlexVelezLl

packages/kolibri-common/components/SyncSchedule/EditDeviceSyncSchedule.vue

@@ -31,6 +31,7 @@
                 :style="selectorStyle"
                 :options="selectArray"
                 :label="$tr('frequency')"
+                @select="handleUserInput"
               />
             </KGridItem>
           </KGrid>
@@ -43,6 +44,7 @@
                 :style="selectorStyle"
                 :options="getDays"
                 :label="$tr('day')"
+                @select="handleUserInput"
               />
             </KGridItem>
           </KGrid>
@@ -55,6 +57,7 @@
                 :style="selectorStyle"
                 :options="SyncTime"
                 :label="$tr('time')"
+                @select="handleUserInput"
               />
             </KGridItem>
           </KGrid>
@@ -78,7 +81,7 @@
             <KCheckbox
               :checked="retryFlag"
               :disabled="currentTaskRunning"
-              @change="retryFlag = !retryFlag"
+              @change="handleRetryCheckboxChange"
             >
               {{ $tr('checkboxLabel') }}
             </KCheckbox>
@@ -222,9 +225,9 @@
         device: null,
         now: null,
         selectedItem: {},
-        // tasks: [],
         selectedDay: {},
         selectedTime: {},
+        userHasEdited: false,
       };
     },
     computed: {
@@ -321,7 +324,7 @@
     },
     watch: {
       currentTask() {
-        if (this.currentTask) {
+        if (this.currentTask && !this.userHasEdited) {
           const enqueueAt = new Date(Date.parse(this.currentTask.scheduled_datetime));
           const day = enqueueAt.getDay();
           const hours = enqueueAt.getHours();
@@ -438,12 +441,8 @@
           })
           .catch(() => {
             this.createTaskFailedSnackbar();
-            // if (this.currentTask) {
-            //   this.fetchSyncTasks();
-            // }
           });
       },
-
       goBack() {
         this.$router.push(this.goBackRoute);
       },
@@ -461,6 +460,13 @@
           this.device = device;
         });
       },
+      handleUserInput() {
+        this.userHasEdited = true;
+      },
+      handleRetryCheckboxChange() {
+        this.retryFlag = !this.retryFlag;
+        this.handleUserInput();
+      },
     },
     $trs: {
       editSyncScheduleTitle: {

packages/kolibri-common/composables/useTaskPooling.js

@@ -1,9 +1,12 @@
+import logger from 'kolibri-logging';
 import { ref, onMounted, onUnmounted } from 'vue';
 import { useTimeoutPoll } from '@vueuse/core';
 import TaskResource from 'kolibri/apiResources/TaskResource';
 
 const taskPollers = new Map();
 
+const logging = logger.getLogger(__filename);
+
 export default function useTaskPooling(queueName) {
   if (!taskPollers.has(queueName)) {
     const consumers = ref(0);
@@ -14,7 +17,7 @@ export default function useTaskPooling(queueName) {
         try {
           tasks.value = await TaskResource.list({ queue: queueName });
         } catch (e) {
-          console.error(e);
+          logging.error('Error while fetching tasks', e);
         }
       },
       5000,
@@ -25,11 +28,10 @@ export default function useTaskPooling(queueName) {
   }
 
   const poller = taskPollers.get(queueName);
-  poller.consumers.value++;
-
 
   onMounted(() => {
-    if (!poller.isActive) {
+    poller.consumers.value++;
+    if (!poller.isActive.value) {
       poller.resume();
     }
   });