From 4eeedcc677e1215c4cfcec66217cc53155b97943 Mon Sep 17 00:00:00 2001
From: Marcella Maki <marcellamaki@gmail.com>
Date: Tue, 21 Nov 2023 14:30:54 -0500
Subject: [PATCH 1/3] Add additional TaskType constant for sync cleanup tasks,
 and filter out sync cleanup and LOD sync tasks from the Facility Task
 Management display

---
 kolibri/core/assets/src/utils/syncTaskUtils.js           | 1 +
 kolibri/core/assets/src/views/sync/FacilityTaskPanel.vue | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/kolibri/core/assets/src/utils/syncTaskUtils.js b/kolibri/core/assets/src/utils/syncTaskUtils.js
index 3cf3dea0748..3c0fa045ba9 100644
--- a/kolibri/core/assets/src/utils/syncTaskUtils.js
+++ b/kolibri/core/assets/src/utils/syncTaskUtils.js
@@ -24,6 +24,7 @@ export const TaskTypes = {
   IMPORTUSERSFROMCSV: 'kolibri.core.auth.tasks.importusersfromcsv',
   EXPORTUSERSTOCSV: 'kolibri.core.auth.tasks.exportuserstocsv',
   IMPORTLODUSER: 'kolibri.core.auth.tasks.peeruserimport',
+  CLEANUPSYNC: 'kolibri.core.auth.tasks.cleanupsync',
 };
 
 // identical to facility constants.js
diff --git a/kolibri/core/assets/src/views/sync/FacilityTaskPanel.vue b/kolibri/core/assets/src/views/sync/FacilityTaskPanel.vue
index a62c0b3a7d0..0dfc3b1bf4d 100644
--- a/kolibri/core/assets/src/views/sync/FacilityTaskPanel.vue
+++ b/kolibri/core/assets/src/views/sync/FacilityTaskPanel.vue
@@ -1,6 +1,7 @@
 <template>
 
   <FacilityTaskPanelDetails
+    v-if="taskShouldDisplay"
     :statusMsg="taskInfo.statusMsg"
     :headingMsg="taskInfo.headingMsg"
     :underHeadingMsg="taskInfo.deviceNameMsg"
@@ -73,6 +74,9 @@
       isImportTask() {
         return this.task.type === TaskTypes.SYNCPEERPULL;
       },
+      isSyncCleanupTask() {
+        return this.task.type === TaskTypes.CLEANUPSYNC;
+      },
       taskInfo() {
         if (this.isSetupImportTask) {
           return importFacilityTaskDisplayInfo(this.task);
@@ -88,6 +92,9 @@
         }
         return {};
       },
+      taskShouldDisplay() {
+        return !this.isLODImportTask && !this.isSyncCleanupTask;
+      },
       loaderType() {
         const { sync_state = '' } = this.task;
         if (indeterminateSyncStatuses.find(s => s === sync_state)) {

From 9fbe72c9a3d5e828d4a49f917a071bfe67fb9a87 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Tue, 21 Nov 2023 13:01:31 -0800
Subject: [PATCH 2/3] Revert "Add additional TaskType constant for sync cleanup
 tasks, and filter out sync cleanup and LOD sync tasks from the Facility Task
 Management display"

This reverts commit 4eeedcc677e1215c4cfcec66217cc53155b97943.
---
 kolibri/core/assets/src/utils/syncTaskUtils.js           | 1 -
 kolibri/core/assets/src/views/sync/FacilityTaskPanel.vue | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/kolibri/core/assets/src/utils/syncTaskUtils.js b/kolibri/core/assets/src/utils/syncTaskUtils.js
index 3c0fa045ba9..3cf3dea0748 100644
--- a/kolibri/core/assets/src/utils/syncTaskUtils.js
+++ b/kolibri/core/assets/src/utils/syncTaskUtils.js
@@ -24,7 +24,6 @@ export const TaskTypes = {
   IMPORTUSERSFROMCSV: 'kolibri.core.auth.tasks.importusersfromcsv',
   EXPORTUSERSTOCSV: 'kolibri.core.auth.tasks.exportuserstocsv',
   IMPORTLODUSER: 'kolibri.core.auth.tasks.peeruserimport',
-  CLEANUPSYNC: 'kolibri.core.auth.tasks.cleanupsync',
 };
 
 // identical to facility constants.js
diff --git a/kolibri/core/assets/src/views/sync/FacilityTaskPanel.vue b/kolibri/core/assets/src/views/sync/FacilityTaskPanel.vue
index 0dfc3b1bf4d..a62c0b3a7d0 100644
--- a/kolibri/core/assets/src/views/sync/FacilityTaskPanel.vue
+++ b/kolibri/core/assets/src/views/sync/FacilityTaskPanel.vue
@@ -1,7 +1,6 @@
 <template>
 
   <FacilityTaskPanelDetails
-    v-if="taskShouldDisplay"
     :statusMsg="taskInfo.statusMsg"
     :headingMsg="taskInfo.headingMsg"
     :underHeadingMsg="taskInfo.deviceNameMsg"
@@ -74,9 +73,6 @@
       isImportTask() {
         return this.task.type === TaskTypes.SYNCPEERPULL;
       },
-      isSyncCleanupTask() {
-        return this.task.type === TaskTypes.CLEANUPSYNC;
-      },
       taskInfo() {
         if (this.isSetupImportTask) {
           return importFacilityTaskDisplayInfo(this.task);
@@ -92,9 +88,6 @@
         }
         return {};
       },
-      taskShouldDisplay() {
-        return !this.isLODImportTask && !this.isSyncCleanupTask;
-      },
       loaderType() {
         const { sync_state = '' } = this.task;
         if (indeterminateSyncStatuses.find(s => s === sync_state)) {

From ecdba515d5f688d9b5d08540cb29033a09e90b34 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Tue, 21 Nov 2023 13:02:05 -0800
Subject: [PATCH 3/3] Remove queue from cleanupsync task to keep it from
 displaying in UI

---
 kolibri/core/auth/tasks.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kolibri/core/auth/tasks.py b/kolibri/core/auth/tasks.py
index 0532678dfcf..b1a1e166ca7 100644
--- a/kolibri/core/auth/tasks.py
+++ b/kolibri/core/auth/tasks.py
@@ -648,7 +648,6 @@ def validate(self, data):
     track_progress=False,
     cancellable=False,
     long_running=True,
-    queue=facility_task_queue,
     status_fn=status_fn,
 )
 def cleanupsync(**kwargs):