From 44b92dab72c625d0eb9de1a331c5be5ef891aa8f Mon Sep 17 00:00:00 2001
From: MisRob <robosovam@gmail.com>
Date: Fri, 1 Sep 2023 15:17:57 +0200
Subject: [PATCH 01/53] Add temporary reference to KDS fork

---
 kolibri/core/package.json                                     | 2 +-
 .../plugins/learn/assets/src/views/LearningActivityBar.vue    | 2 +-
 packages/kolibri-core-for-export/package.json                 | 2 +-
 yarn.lock                                                     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kolibri/core/package.json b/kolibri/core/package.json
index 4138f1e1b0e..81a9567f883 100644
--- a/kolibri/core/package.json
+++ b/kolibri/core/package.json
@@ -21,7 +21,7 @@
     "js-cookie": "^3.0.5",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.2.0",
-    "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#2e5c1e8fc9a5239eaf3780639953619f34b6a2be",
+    "kolibri-design-system": "https://github.com/MisRob/kolibri-design-system#cfd99deadd301aae83598afb5c6290085f8351fb",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.8.1",
diff --git a/kolibri/plugins/learn/assets/src/views/LearningActivityBar.vue b/kolibri/plugins/learn/assets/src/views/LearningActivityBar.vue
index fc6ea787d27..f674355ef52 100644
--- a/kolibri/plugins/learn/assets/src/views/LearningActivityBar.vue
+++ b/kolibri/plugins/learn/assets/src/views/LearningActivityBar.vue
@@ -40,7 +40,7 @@
           -->
           <span ref="downloadingLoader">
             <KCircularLoader
-              :show="isDownloading"
+              :shouldShow="isDownloading"
               :minVisibleTime="3000"
               data-test="downloadingLoader"
               :size="24"
diff --git a/packages/kolibri-core-for-export/package.json b/packages/kolibri-core-for-export/package.json
index b3108d3ba10..e77d6593273 100644
--- a/packages/kolibri-core-for-export/package.json
+++ b/packages/kolibri-core-for-export/package.json
@@ -24,7 +24,7 @@
     "intl": "^1.2.4",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.2.0",
-    "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#2e5c1e8fc9a5239eaf3780639953619f34b6a2be",
+    "kolibri-design-system": "https://github.com/MisRob/kolibri-design-system#cfd99deadd301aae83598afb5c6290085f8351fb",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.8.1",
diff --git a/yarn.lock b/yarn.lock
index a305b687e59..0e3908a2098 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7619,9 +7619,9 @@ kolibri-constants@0.2.0:
   resolved "https://registry.yarnpkg.com/kolibri-constants/-/kolibri-constants-0.2.0.tgz#47c9d773894e23251ba5ac4db420822e45603142"
   integrity sha512-WYDMGDzB9gNxRbpX1O2cGe1HrJvLvSZGwMuAv6dqrxJgPf7iO+Hi40/1CXjHM7nk5CRt+hn5bqnMzCBmj1omPA==
 
-"kolibri-design-system@https://github.com/learningequality/kolibri-design-system#2e5c1e8fc9a5239eaf3780639953619f34b6a2be":
+"kolibri-design-system@https://github.com/MisRob/kolibri-design-system#cfd99deadd301aae83598afb5c6290085f8351fb":
   version "1.3.0"
-  resolved "https://github.com/learningequality/kolibri-design-system#2e5c1e8fc9a5239eaf3780639953619f34b6a2be"
+  resolved "https://github.com/MisRob/kolibri-design-system#cfd99deadd301aae83598afb5c6290085f8351fb"
   dependencies:
     aphrodite "https://github.com/learningequality/aphrodite/"
     autosize "^3.0.21"

From 744100789dd6a83be73bb8589ffc5530d7b7cad5 Mon Sep 17 00:00:00 2001
From: MisRob <robosovam@gmail.com>
Date: Fri, 1 Sep 2023 15:36:12 +0200
Subject: [PATCH 02/53] Add useKShow to apiSpec

---
 kolibri/core/assets/src/core-app/apiSpec.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kolibri/core/assets/src/core-app/apiSpec.js b/kolibri/core/assets/src/core-app/apiSpec.js
index 02ee53934af..83d9bf0de10 100644
--- a/kolibri/core/assets/src/core-app/apiSpec.js
+++ b/kolibri/core/assets/src/core-app/apiSpec.js
@@ -18,6 +18,7 @@ import UiAlert from 'kolibri-design-system/lib/keen/UiAlert';
 import responsiveWindowMixin from 'kolibri-design-system/lib/KResponsiveWindowMixin';
 import responsiveElementMixin from 'kolibri-design-system/lib/KResponsiveElementMixin';
 import useKResponsiveWindow from 'kolibri-design-system/lib/useKResponsiveWindow';
+import useKShow from 'kolibri-design-system/lib/composables/useKShow';
 import UiIconButton from 'kolibri-design-system/lib/keen/UiIconButton'; // temp hack
 import * as vueCompositionApi from '@vue/composition-api';
 import logging from '../logging';
@@ -230,6 +231,7 @@ export default {
     },
     composables: {
       useKResponsiveWindow,
+      useKShow,
       useMinimumKolibriVersion,
       useUser,
     },

From 4080bd6ee0ca93f2a1bf6cc8cad1b9acf129a2b2 Mon Sep 17 00:00:00 2001
From: MisRob <robosovam@gmail.com>
Date: Thu, 31 Aug 2023 11:18:50 +0200
Subject: [PATCH 03/53] Fetch lesson sizes before commiting new lessons

so that they can be commited together with their sizes.

Fixes https://github.com/learningequality/kolibri/issues/10797
---
 .../assets/src/modules/lessonsRoot/actions.js | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/modules/lessonsRoot/actions.js b/kolibri/plugins/coach/assets/src/modules/lessonsRoot/actions.js
index ab9e4ff0caf..17c4bd0d4d5 100644
--- a/kolibri/plugins/coach/assets/src/modules/lessonsRoot/actions.js
+++ b/kolibri/plugins/coach/assets/src/modules/lessonsRoot/actions.js
@@ -16,24 +16,37 @@ export function refreshClassLessons(store, classId) {
     force: true,
   })
     .then(lessons => {
+      // Fetch lesson sizes before commiting new lessons
+      // so that they can be commited together with their sizes.
+      // Fixes https://github.com/learningequality/kolibri/issues/10797
+      if (Object.keys(lessons).length > 0) {
+        return store.dispatch('fetchLessonsSizes', classId, false).then(sizes => {
+          return { lessons, sizes };
+        });
+      } else {
+        return { lessons, sizes: null };
+      }
+    })
+    .then(({ lessons, sizes }) => {
       store.commit('SET_CLASS_LESSONS', lessons);
+      if (sizes) {
+        store.commit('SET_CLASS_LESSONS_SIZES', sizes);
+      }
       // resolve lessons in case it's needed
       return lessons;
     })
-    .then(lessons => {
-      if (Object.keys(lessons).length > 0) {
-        return store.dispatch('fetchLessonsSizes', classId);
-      }
-    })
     .catch(error => {
       return store.dispatch('handleApiError', { error }, { root: true });
     });
 }
 
-export function fetchLessonsSizes(store, classId) {
+export function fetchLessonsSizes(store, classId, shouldCommit = true) {
   return LessonResource.fetchLessonsSizes({ collection: classId })
     .then(sizes => {
-      store.commit('SET_CLASS_LESSONS_SIZES', sizes);
+      if (shouldCommit) {
+        store.commit('SET_CLASS_LESSONS_SIZES', sizes);
+      }
+      return sizes;
     })
     .catch(error => {
       return store.dispatch('handleApiError', { error }, { root: true });

From eca698de5fde21226c8d8fab454a2cc2072ebbfb Mon Sep 17 00:00:00 2001
From: MisRob <robosovam@gmail.com>
Date: Fri, 1 Sep 2023 17:25:53 +0200
Subject: [PATCH 04/53] Add loader when toggling lessons

- Resolves seemingly unresponsive toggle switch
on slow networks and prevents from repeated clicks.
- Includes related re-ordering of async events
to achieve consistent UX.
---
 .../src/views/plan/LessonsRootPage/index.vue  | 66 ++++++++++++++-----
 1 file changed, 51 insertions(+), 15 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonsRootPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonsRootPage/index.vue
index 8ecbe6901ff..57a571d9607 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/LessonsRootPage/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/LessonsRootPage/index.vue
@@ -63,13 +63,26 @@
                   />
                 </td>
                 <td>
-                  <KSwitch
-                    name="toggle-lesson-visibility"
-                    label=""
-                    :checked="lesson.is_active"
-                    :value="lesson.is_active"
-                    @change="toggleModal(lesson)"
-                  />
+                  <div :style="{ height: '28px' }">
+                    <KTransition kind="component-fade-out-in">
+                      <KCircularLoader
+                        v-if="show(lesson.id, isUpdatingVisibility(lesson.id), 2000)"
+                        :key="`loader-${lesson.id}`"
+                        disableDefaultTransition
+                        :style="{ display: 'inline-block', marginLeft: '6px' }"
+                        :size="26"
+                      />
+                      <KSwitch
+                        v-else
+                        :key="`switch-${lesson.id}`"
+                        name="toggle-lesson-visibility"
+                        label=""
+                        :checked="lesson.is_active"
+                        :value="lesson.is_active"
+                        @change="toggleModal(lesson)"
+                      />
+                    </KTransition>
+                  </div>
                 </td>
               </tr>
             </transition-group>
@@ -148,6 +161,7 @@
 
 <script>
 
+  import Vue from 'vue';
   import { mapState, mapActions } from 'vuex';
   import { LessonResource } from 'kolibri.resources';
   import countBy from 'lodash/countBy';
@@ -159,6 +173,7 @@
   import CoreTable from 'kolibri.coreVue.components.CoreTable';
   import CatchErrors from 'kolibri.utils.CatchErrors';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
+  import useKShow from 'kolibri.coreVue.composables.useKShow';
   import bytesForHumans from 'kolibri.utils.bytesForHumans';
   import CoachAppBarPage from '../../CoachAppBarPage';
   import { LessonsPageNames } from '../../../constants/lessonsConstants';
@@ -179,8 +194,9 @@
     },
     mixins: [commonCoach, commonCoreStrings],
     setup() {
+      const { show } = useKShow();
       const { lessonsAreLoading } = useLessons();
-      return { lessonsAreLoading };
+      return { show, lessonsAreLoading };
     },
     data() {
       return {
@@ -194,6 +210,9 @@
         detailsModalIsDisabled: false,
         dontShowAgainChecked: false,
         learnOnlyDevicesExist: false,
+        // contains ids of lessons whose visibility
+        // status is currently being updated
+        updatingVisibilityLessons: {},
       };
     },
     computed: {
@@ -290,18 +309,35 @@
         const snackbarMessage = newActiveState
           ? this.coachString('lessonVisibleToLearnersLabel')
           : this.coachString('lessonNotVisibleToLearnersLabel');
-        const promise = LessonResource.saveModel({
+        this.manageModalVisibilityAndPreferences();
+
+        Vue.set(this.updatingVisibilityLessons, lesson.id, lesson.id);
+        return LessonResource.saveModel({
           id: lesson.id,
           data: {
             is_active: newActiveState,
           },
           exists: true,
-        });
-        this.manageModalVisibilityAndPreferences();
-        return promise.then(() => {
-          this.$store.dispatch('lessonsRoot/refreshClassLessons', this.$route.params.classId);
-          this.$store.dispatch('createSnackbar', snackbarMessage);
-        });
+        })
+          .then(() => {
+            return this.$store.dispatch(
+              'lessonsRoot/refreshClassLessons',
+              this.$route.params.classId
+            );
+          })
+          .then(() => {
+            Vue.delete(this.updatingVisibilityLessons, lesson.id);
+            // slightly delay to sync a bit better with the toggle loader
+            setTimeout(() => {
+              this.$store.dispatch('createSnackbar', snackbarMessage);
+            }, 1000);
+          })
+          .catch(() => {
+            Vue.delete(this.updatingVisibilityLessons, lesson.id);
+          });
+      },
+      isUpdatingVisibility(lessonId) {
+        return Object.keys(this.updatingVisibilityLessons).includes(lessonId);
       },
       toggleModal(lesson) {
         // has the user set their preferences to not have a modal confirmation?

From 2cc02bc0d40426ca7c4423ba1276d6b46e25b83b Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Fri, 15 Sep 2023 12:20:36 -0700
Subject: [PATCH 05/53] Don't use force deletion when cleaning up resources for
 content removal requests. As could remove other resources that have not been
 flagged for removal.

---
 kolibri/core/content/utils/content_request.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kolibri/core/content/utils/content_request.py b/kolibri/core/content/utils/content_request.py
index cec567500f4..80cdc6a8fe0 100644
--- a/kolibri/core/content/utils/content_request.py
+++ b/kolibri/core/content/utils/content_request.py
@@ -924,7 +924,6 @@ def process_content_removal_requests(queryset):
                 "deletecontent",
                 channel_id,
                 node_ids=contentnode_ids,
-                force_delete=True,
             )
             # mark all as completed
             channel_requests.update(status=ContentRequestStatus.Completed)

From ecee1bea8d89bc0b5bf42590958a72376745308d Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Fri, 15 Sep 2023 14:22:22 -0700
Subject: [PATCH 06/53] Tweak which models to exclude from schema generation.
 Do previously omitted update to current content schema reflection.

---
 .../contentschema/versions/content_schema_current.py     | 1 +
 .../core/content/management/commands/generate_schema.py  | 4 ++--
 kolibri/core/content/utils/channel_import.py             | 9 +++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/kolibri/core/content/contentschema/versions/content_schema_current.py b/kolibri/core/content/contentschema/versions/content_schema_current.py
index a659a0ab938..f3db9a66f42 100644
--- a/kolibri/core/content/contentschema/versions/content_schema_current.py
+++ b/kolibri/core/content/contentschema/versions/content_schema_current.py
@@ -93,6 +93,7 @@ class ContentContentnode(Base):
     learner_needs_bitmask_0 = Column(BigInteger)
     learning_activities_bitmask_0 = Column(BigInteger)
     ancestors = Column(Text)
+    admin_imported = Column(Boolean)
     parent_id = Column(ForeignKey("content_contentnode.id"), index=True)
 
     lang = relationship("ContentLanguage")
diff --git a/kolibri/core/content/management/commands/generate_schema.py b/kolibri/core/content/management/commands/generate_schema.py
index 85c9916d619..e580dc91e5d 100644
--- a/kolibri/core/content/management/commands/generate_schema.py
+++ b/kolibri/core/content/management/commands/generate_schema.py
@@ -19,7 +19,7 @@
 from kolibri.core.content.apps import KolibriContentConfig
 from kolibri.core.content.constants.schema_versions import CONTENT_SCHEMA_VERSION
 from kolibri.core.content.constants.schema_versions import CURRENT_SCHEMA_VERSION
-from kolibri.core.content.utils.channel_import import models_to_exclude
+from kolibri.core.content.utils.channel_import import no_schema_models
 from kolibri.core.content.utils.sqlalchemybridge import __SQLALCHEMY_CLASSES_MODULE_NAME
 from kolibri.core.content.utils.sqlalchemybridge import __SQLALCHEMY_CLASSES_PATH
 from kolibri.core.content.utils.sqlalchemybridge import (
@@ -100,7 +100,7 @@ def handle(self, *args, **options):
         table_names = [
             model._meta.db_table
             for name, model in app_config.models.items()
-            if name != "channelmetadatacache" and model not in models_to_exclude
+            if name != "channelmetadatacache" and model not in no_schema_models
         ]
         metadata.reflect(bind=engine, only=table_names)
         Base = prepare_base(metadata, name=version)
diff --git a/kolibri/core/content/utils/channel_import.py b/kolibri/core/content/utils/channel_import.py
index e3022a7d1b7..8013c16c2cb 100644
--- a/kolibri/core/content/utils/channel_import.py
+++ b/kolibri/core/content/utils/channel_import.py
@@ -49,13 +49,18 @@
 
 models_not_to_overwrite = [LocalFile]
 
-models_to_exclude = [
-    apps.get_model(CONTENT_APP_NAME, "ChannelMetadata_included_languages"),
+# Models that are in the content app, but for which we do not want to generate a schema
+# using SQLAlchemy.
+no_schema_models = [
     apps.get_model(CONTENT_APP_NAME, "ContentRequest"),
     apps.get_model(CONTENT_APP_NAME, "ContentDownloadRequest"),
     apps.get_model(CONTENT_APP_NAME, "ContentRemovalRequest"),
 ]
 
+models_to_exclude = [
+    apps.get_model(CONTENT_APP_NAME, "ChannelMetadata_included_languages"),
+] + no_schema_models
+
 
 SOURCE_DB_ALIAS = "sourcedb"
 

From 804f58145012ce6a37934f096aac9c5c6b2faab9 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Fri, 15 Sep 2023 14:46:49 -0700
Subject: [PATCH 07/53] Set the admin imported flag during resource import.

---
 kolibri/core/content/test/test_annotation.py  | 72 ++++++++++++++++++-
 .../core/content/test/test_import_export.py   | 12 +++-
 kolibri/core/content/utils/annotation.py      | 36 +++++++---
 kolibri/core/content/utils/resource_import.py | 11 +++
 4 files changed, 121 insertions(+), 10 deletions(-)

diff --git a/kolibri/core/content/test/test_annotation.py b/kolibri/core/content/test/test_annotation.py
index 8bb36f2f392..87711660a41 100644
--- a/kolibri/core/content/test/test_annotation.py
+++ b/kolibri/core/content/test/test_annotation.py
@@ -375,7 +375,7 @@ def test_all_local_files_available_exclude_duplicate_topic(self):
             ContentNode.objects.filter(title="c2c1", available=True).count(), 1
         )
 
-    def test_all_local_files_available_include_orignial_exclude_duplicate_topic(self):
+    def test_all_local_files_available_include_original_exclude_duplicate_topic(self):
         ContentNode.objects.all().update(available=False)
         LocalFile.objects.all().update(available=True)
         parent = ContentNode.objects.get(title="c3")
@@ -419,6 +419,76 @@ def test_all_local_files_available_non_include_exclude_unaffected(self):
         node.refresh_from_db()
         self.assertTrue(node.available)
 
+    def test_all_local_files_admin_imported_true(self):
+        ContentNode.objects.all().update(available=False)
+        LocalFile.objects.all().update(available=True)
+        node = ContentNode.objects.get(title="copy", kind=content_kinds.VIDEO)
+        set_leaf_node_availability_from_local_file_availability(
+            test_channel_id, admin_imported=True
+        )
+        node.refresh_from_db()
+        self.assertTrue(node.admin_imported)
+
+    def test_all_local_files_admin_imported_true_overwrites(self):
+        ContentNode.objects.all().update(available=False)
+        LocalFile.objects.all().update(available=True)
+        node = ContentNode.objects.get(title="copy", kind=content_kinds.VIDEO)
+        node.admin_imported = False
+        node.save()
+        set_leaf_node_availability_from_local_file_availability(
+            test_channel_id, admin_imported=True
+        )
+        node.refresh_from_db()
+        self.assertTrue(node.admin_imported)
+
+    def test_all_local_files_admin_imported_false(self):
+        ContentNode.objects.all().update(available=False)
+        LocalFile.objects.all().update(available=True)
+        node = ContentNode.objects.get(title="copy", kind=content_kinds.VIDEO)
+        set_leaf_node_availability_from_local_file_availability(
+            test_channel_id, admin_imported=False
+        )
+        node.refresh_from_db()
+        self.assertFalse(node.admin_imported)
+
+    def test_all_local_files_admin_imported_false_no_overwrite(self):
+        ContentNode.objects.all().update(available=False)
+        LocalFile.objects.all().update(available=True)
+        node = ContentNode.objects.get(title="copy", kind=content_kinds.VIDEO)
+        node.admin_imported = True
+        node.save()
+        set_leaf_node_availability_from_local_file_availability(
+            test_channel_id, admin_imported=False
+        )
+        node.refresh_from_db()
+        self.assertTrue(node.admin_imported)
+
+    def test_all_local_files_admin_imported_none_no_effect(self):
+        ContentNode.objects.all().update(available=False)
+        LocalFile.objects.all().update(available=True)
+        node = ContentNode.objects.get(title="copy", kind=content_kinds.VIDEO)
+        set_leaf_node_availability_from_local_file_availability(test_channel_id)
+        node.refresh_from_db()
+        self.assertIsNone(node.admin_imported)
+
+    def test_all_local_files_admin_imported_non_include_exclude_unaffected(self):
+        ContentNode.objects.all().update(available=False)
+        LocalFile.objects.all().update(available=True)
+        exclude = ContentNode.objects.get(title="c3")
+        include = ContentNode.objects.get(title="c2")
+        node = ContentNode.objects.get(title="copy", kind=content_kinds.VIDEO)
+        self.assertFalse(node.available)
+        node.admin_imported = False
+        node.save()
+        set_leaf_node_availability_from_local_file_availability(
+            test_channel_id,
+            node_ids=[include.id],
+            exclude_node_ids=[exclude.id],
+            admin_imported=True,
+        )
+        node.refresh_from_db()
+        self.assertFalse(node.admin_imported)
+
     def tearDown(self):
         call_command("flush", interactive=False)
         super(AnnotationFromLocalFileAvailability, self).tearDown()
diff --git a/kolibri/core/content/test/test_import_export.py b/kolibri/core/content/test/test_import_export.py
index 7f94911c29f..1f9ea9549d6 100644
--- a/kolibri/core/content/test/test_import_export.py
+++ b/kolibri/core/content/test/test_import_export.py
@@ -1007,6 +1007,7 @@ def test_remote_import_httperror_404(
             node_ids={self.c2c1_node_id},
             exclude_node_ids=None,
             public=False,
+            admin_imported=True,
         )
 
     @patch("kolibri.core.content.utils.resource_import.transfer.FileDownload")
@@ -1032,7 +1033,12 @@ def test_remote_import_httperror_500(
             manager = RemoteChannelResourceImportManager(self.the_channel_id)
             manager.run()
         self.annotation_mock.set_content_visibility.assert_called_with(
-            self.the_channel_id, [], node_ids=None, exclude_node_ids=None, public=False
+            self.the_channel_id,
+            [],
+            node_ids=None,
+            exclude_node_ids=None,
+            public=False,
+            admin_imported=True,
         )
 
     @patch("kolibri.core.content.utils.resource_import.get_free_space")
@@ -1140,6 +1146,7 @@ def test_remote_import_no_space_after_first_download(
             exclude_node_ids=None,
             node_ids=None,
             public=False,
+            admin_imported=True,
         )
 
     @patch("kolibri.utils.file_transfer.sleep")
@@ -1422,6 +1429,7 @@ def test_remote_import_source_corrupted(
             exclude_node_ids=None,
             node_ids={self.c1_node_id},
             public=False,
+            admin_imported=True,
         )
 
     @patch(
@@ -1480,6 +1488,7 @@ def test_remote_import_full_import(
             exclude_node_ids=None,
             node_ids=None,
             public=False,
+            admin_imported=True,
         )
 
     def test_local_import_with_detected_manifest_file(
@@ -1988,6 +1997,7 @@ def test_remote_import_fail_on_error_missing(
             node_ids={self.c2c1_node_id},
             exclude_node_ids=None,
             public=False,
+            admin_imported=True,
         )
 
     @patch("kolibri.core.content.utils.resource_import.logger.warning")
diff --git a/kolibri/core/content/utils/annotation.py b/kolibri/core/content/utils/annotation.py
index 48de7164188..b7a51b71961 100644
--- a/kolibri/core/content/utils/annotation.py
+++ b/kolibri/core/content/utils/annotation.py
@@ -18,6 +18,7 @@
 from sqlalchemy import select
 from sqlalchemy import String
 from sqlalchemy.sql.expression import literal
+from sqlalchemy.sql.functions import coalesce
 
 from .paths import get_content_file_name
 from .paths import get_content_storage_file_path
@@ -300,7 +301,7 @@ def set_leaf_nodes_invisible(channel_id, node_ids=None, exclude_node_ids=None):
 
 
 def set_leaf_node_availability_from_local_file_availability(
-    channel_id, node_ids=None, exclude_node_ids=None
+    channel_id, node_ids=None, exclude_node_ids=None, admin_imported=None
 ):
     """
     Set nodes in a channel as available, based on their required files.
@@ -369,6 +370,15 @@ def set_leaf_node_availability_from_local_file_availability(
         )
     )
 
+    values_dict = {
+        "available": exists(contentnode_statement),
+    }
+
+    if admin_imported is not None:
+        values_dict["admin_imported"] = or_(
+            admin_imported, coalesce(ContentNodeTable.c.admin_imported, False)
+        )
+
     while min_boundary < max_rght:
         batch_statement = _create_batch_update_statement(
             bridge,
@@ -381,9 +391,7 @@ def set_leaf_node_availability_from_local_file_availability(
 
         # Execute the update for this batch
         connection.execute(
-            batch_statement.values(
-                available=exists(contentnode_statement)
-            ).execution_options(autocommit=True)
+            batch_statement.values(**values_dict).execution_options(autocommit=True)
         )
         min_boundary += dynamic_chunksize
 
@@ -691,10 +699,13 @@ def reannotate_all_channels():
 
 
 def update_content_metadata(
-    channel_id, node_ids=None, exclude_node_ids=None, public=None
+    channel_id, node_ids=None, exclude_node_ids=None, public=None, admin_imported=None
 ):
     set_leaf_node_availability_from_local_file_availability(
-        channel_id, node_ids=node_ids, exclude_node_ids=exclude_node_ids
+        channel_id,
+        node_ids=node_ids,
+        exclude_node_ids=exclude_node_ids,
+        admin_imported=admin_imported,
     )
     recurse_annotation_up_tree(channel_id)
     set_channel_metadata_fields(channel_id, public=public)
@@ -705,11 +716,20 @@ def update_content_metadata(
 
 
 def set_content_visibility(
-    channel_id, checksums, node_ids=None, exclude_node_ids=None, public=None
+    channel_id,
+    checksums,
+    node_ids=None,
+    exclude_node_ids=None,
+    public=None,
+    admin_imported=None,
 ):
     mark_local_files_as_available(checksums)
     update_content_metadata(
-        channel_id, node_ids=node_ids, exclude_node_ids=exclude_node_ids, public=public
+        channel_id,
+        node_ids=node_ids,
+        exclude_node_ids=exclude_node_ids,
+        public=public,
+        admin_imported=admin_imported,
     )
 
 
diff --git a/kolibri/core/content/utils/resource_import.py b/kolibri/core/content/utils/resource_import.py
index cae65bd3d0a..5df3cb8f6b9 100644
--- a/kolibri/core/content/utils/resource_import.py
+++ b/kolibri/core/content/utils/resource_import.py
@@ -66,6 +66,7 @@ def __init__(
         all_thumbnails=False,
         fail_on_error=False,
         content_dir=None,
+        admin_imported=True,
     ):
         self.channel_id = channel_id
 
@@ -81,6 +82,7 @@ def __init__(
         self.all_thumbnails = all_thumbnails
         self.fail_on_error = fail_on_error
         self.content_dir = content_dir or conf.OPTIONS["Paths"]["CONTENT_DIR"]
+        self.admin_imported = admin_imported
         super(ResourceImportManagerBase, self).__init__()
 
     @classmethod
@@ -301,6 +303,7 @@ def run_import(self):
             node_ids=self.node_ids,
             exclude_node_ids=self.exclude_node_ids,
             public=self.public,
+            admin_imported=self.admin_imported,
         )
 
         self.resources_after_transfer = (
@@ -347,6 +350,7 @@ def __init__(
         all_thumbnails=False,
         fail_on_error=False,
         content_dir=None,
+        admin_imported=True,
         timeout=transfer.Transfer.DEFAULT_TIMEOUT,
     ):
         super(RemoteResourceImportManagerBase, self).__init__(
@@ -357,6 +361,7 @@ def __init__(
             all_thumbnails=all_thumbnails,
             fail_on_error=fail_on_error,
             content_dir=content_dir,
+            admin_imported=admin_imported,
         )
         self.timeout = timeout
         self.peer_id = peer_id
@@ -405,6 +410,7 @@ def __init__(
         all_thumbnails=False,
         fail_on_error=False,
         content_dir=None,
+        admin_imported=True,
     ):
         self.drive_id = drive_id
         if drive_id and not path:
@@ -420,6 +426,7 @@ def __init__(
             all_thumbnails=all_thumbnails,
             fail_on_error=fail_on_error,
             content_dir=content_dir,
+            admin_imported=admin_imported,
         )
 
     @staticmethod
@@ -523,6 +530,9 @@ def __init__(
         fail_on_error=False,
         content_dir=None,
         timeout=transfer.Transfer.DEFAULT_TIMEOUT,
+        # As this is primarily used for importing non-admin imported content
+        # we reverse the default here.
+        admin_imported=False,
     ):
         """
         :param channel_id: A hex UUID string
@@ -549,6 +559,7 @@ def __init__(
             renderable_only=renderable_only,
             fail_on_error=fail_on_error,
             content_dir=content_dir,
+            admin_imported=admin_imported,
             timeout=timeout,
         )
         self.peer = peer

From eb2da965522b7e631b461815f24c50299fea6d81 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Fri, 15 Sep 2023 15:00:37 -0700
Subject: [PATCH 08/53] Clean up admin imported flags, except in content
 request cleanups.

---
 .../management/commands/deletecontent.py      | 24 ++++++++++++++-----
 kolibri/core/content/test/test_annotation.py  | 22 +++++++++++++++++
 .../test/utils/test_content_request.py        |  2 +-
 kolibri/core/content/utils/annotation.py      | 22 +++++++++++++----
 kolibri/core/content/utils/content_request.py |  1 +
 5 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/kolibri/core/content/management/commands/deletecontent.py b/kolibri/core/content/management/commands/deletecontent.py
index 9d2c3ae36a4..4143ad6289e 100644
--- a/kolibri/core/content/management/commands/deletecontent.py
+++ b/kolibri/core/content/management/commands/deletecontent.py
@@ -20,7 +20,9 @@
 logger = logging.getLogger(__name__)
 
 
-def delete_metadata(channel, node_ids, exclude_node_ids, force_delete):
+def delete_metadata(
+    channel, node_ids, exclude_node_ids, force_delete, ignore_admin_flags
+):
     # Only delete all metadata if we are not doing selective deletion
     delete_all_metadata = not (node_ids or exclude_node_ids)
 
@@ -31,7 +33,9 @@ def delete_metadata(channel, node_ids, exclude_node_ids, force_delete):
     )
 
     # If we have been passed node ids do not do a full deletion pass
-    set_content_invisible(channel.id, node_ids, exclude_node_ids)
+    set_content_invisible(
+        channel.id, node_ids, exclude_node_ids, not ignore_admin_flags
+    )
     # If everything has been made invisible, delete all the metadata
     delete_all_metadata = delete_all_metadata or not channel.root.available
 
@@ -123,11 +127,20 @@ def add_arguments(self, parser):
             help="Ensure removal of files",
         )
 
+        parser.add_argument(
+            "--ignore_admin_flags",
+            action="store_false",
+            dest="ignore_admin_flags",
+            default=True,
+            help="Don't modify admin_imported values when deleting content",
+        )
+
     def handle_async(self, *args, **options):
         channel_id = options["channel_id"]
         node_ids = options["node_ids"]
         exclude_node_ids = options["exclude_node_ids"]
         force_delete = options["force_delete"]
+        ignore_admin_flags = options["ignore_admin_flags"]
 
         try:
             channel = ChannelMetadata.objects.get(pk=channel_id)
@@ -136,10 +149,9 @@ def handle_async(self, *args, **options):
                 "Channel matching id {id} does not exist".format(id=channel_id)
             )
 
-        (
-            total_resource_number,
-            delete_all_metadata,
-        ) = delete_metadata(channel, node_ids, exclude_node_ids, force_delete)
+        (total_resource_number, delete_all_metadata,) = delete_metadata(
+            channel, node_ids, exclude_node_ids, force_delete, ignore_admin_flags
+        )
         unused_files = LocalFile.objects.get_unused_files()
         # Get the number of files that are being deleted
         unused_files_count = unused_files.count()
diff --git a/kolibri/core/content/test/test_annotation.py b/kolibri/core/content/test/test_annotation.py
index 87711660a41..462a2de5066 100644
--- a/kolibri/core/content/test/test_annotation.py
+++ b/kolibri/core/content/test/test_annotation.py
@@ -194,6 +194,28 @@ def test_all_nodes_available_non_include_exclude_unaffected(self):
         node.refresh_from_db()
         self.assertTrue(node.available)
 
+    def test_all_leaves_clear_admin_imported(self):
+        ContentNode.objects.all().update(available=True)
+        set_leaf_nodes_invisible(test_channel_id, clear_admin_imported=True)
+        self.assertFalse(
+            any(
+                ContentNode.objects.exclude(kind=content_kinds.TOPIC).values_list(
+                    "admin_imported", flat=True
+                )
+            )
+        )
+
+    def test_all_leaves_no_clear_admin_imported(self):
+        ContentNode.objects.all().update(available=True, admin_imported=True)
+        set_leaf_nodes_invisible(test_channel_id)
+        self.assertTrue(
+            all(
+                ContentNode.objects.exclude(kind=content_kinds.TOPIC).values_list(
+                    "admin_imported", flat=True
+                )
+            )
+        )
+
     def tearDown(self):
         call_command("flush", interactive=False)
         super(SetContentNodesInvisibleTestCase, self).tearDown()
diff --git a/kolibri/core/content/test/utils/test_content_request.py b/kolibri/core/content/test/utils/test_content_request.py
index 03796d88c18..cef00a5d9cb 100644
--- a/kolibri/core/content/test/utils/test_content_request.py
+++ b/kolibri/core/content/test/utils/test_content_request.py
@@ -883,7 +883,7 @@ def test_basic(self):
             "deletecontent",
             self.node.channel_id,
             node_ids=[self.request.contentnode_id],
-            force_delete=True,
+            ignore_admin_flags=True,
         )
         self.assertEqual(self.qs.count(), 0)
         self.assertEqual(ContentDownloadRequest.objects.count(), 0)
diff --git a/kolibri/core/content/utils/annotation.py b/kolibri/core/content/utils/annotation.py
index b7a51b71961..e7ff6c9450e 100644
--- a/kolibri/core/content/utils/annotation.py
+++ b/kolibri/core/content/utils/annotation.py
@@ -253,7 +253,9 @@ def _calculate_batch_params(bridge, channel_id, node_ids, exclude_node_ids):
     return max_rght, dynamic_chunksize
 
 
-def set_leaf_nodes_invisible(channel_id, node_ids=None, exclude_node_ids=None):
+def set_leaf_nodes_invisible(
+    channel_id, node_ids=None, exclude_node_ids=None, clear_admin_imported=False
+):
     """
     Set nodes in a channel as unavailable.
     With no additional arguments, this will hide an entire channel.
@@ -280,6 +282,13 @@ def set_leaf_nodes_invisible(channel_id, node_ids=None, exclude_node_ids=None):
         )
     )
 
+    values_dict = {
+        "available": False,
+    }
+
+    if clear_admin_imported:
+        values_dict["admin_imported"] = False
+
     while min_boundary < max_rght:
         batch_statement = _create_batch_update_statement(
             bridge,
@@ -292,7 +301,7 @@ def set_leaf_nodes_invisible(channel_id, node_ids=None, exclude_node_ids=None):
 
         # Execute the update for this batch
         connection.execute(
-            batch_statement.values(available=False).execution_options(autocommit=True)
+            batch_statement.values(**values_dict).execution_options(autocommit=True)
         )
 
         min_boundary += dynamic_chunksize
@@ -738,8 +747,13 @@ def set_content_visibility_from_disk(channel_id):
     update_content_metadata(channel_id)
 
 
-def set_content_invisible(channel_id, node_ids, exclude_node_ids):
-    set_leaf_nodes_invisible(channel_id, node_ids, exclude_node_ids)
+def set_content_invisible(channel_id, node_ids, exclude_node_ids, clear_admin_imported):
+    set_leaf_nodes_invisible(
+        channel_id,
+        node_ids,
+        exclude_node_ids,
+        clear_admin_imported=clear_admin_imported,
+    )
     recurse_annotation_up_tree(channel_id)
     set_channel_metadata_fields(channel_id)
     ContentCacheKey.update_cache_key()
diff --git a/kolibri/core/content/utils/content_request.py b/kolibri/core/content/utils/content_request.py
index 80cdc6a8fe0..140475c863c 100644
--- a/kolibri/core/content/utils/content_request.py
+++ b/kolibri/core/content/utils/content_request.py
@@ -924,6 +924,7 @@ def process_content_removal_requests(queryset):
                 "deletecontent",
                 channel_id,
                 node_ids=contentnode_ids,
+                ignore_admin_flags=True,
             )
             # mark all as completed
             channel_requests.update(status=ContentRequestStatus.Completed)

From 8338d8be4aa0314cdc34c13f4e64dd2ec7d84bf7 Mon Sep 17 00:00:00 2001
From: Vivek Agrawal <vivekmittalagrawal@gmail.com>
Date: Tue, 19 Sep 2023 20:35:42 +0530
Subject: [PATCH 09/53] Decrease time to sync

---
 kolibri/core/auth/tasks.py                    |  5 ++---
 .../core/discovery/utils/network/search.py    | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/kolibri/core/auth/tasks.py b/kolibri/core/auth/tasks.py
index 0b7c0f3f0b9..00ddaad9f15 100644
--- a/kolibri/core/auth/tasks.py
+++ b/kolibri/core/auth/tasks.py
@@ -46,6 +46,7 @@
 from kolibri.core.tasks.exceptions import JobNotFound
 from kolibri.core.tasks.exceptions import UserCancelledError
 from kolibri.core.tasks.job import JobStatus
+from kolibri.core.tasks.job import Priority
 from kolibri.core.tasks.job import State
 from kolibri.core.tasks.main import job_storage
 from kolibri.core.tasks.permissions import IsAdminForJob
@@ -627,9 +628,7 @@ def stop_request_soud_sync(server, user):
     stoppeerusersync(server, user)
 
 
-@register_task(
-    queue=soud_sync_queue,
-)
+@register_task(queue=soud_sync_queue, priority=Priority.HIGH, status_fn=status_fn)
 def request_soud_sync(server, user, queue_id=None, ttl=4):
     """
     Make a request to the serverurl endpoint to sync this SoUD (Subset of Users Device)
diff --git a/kolibri/core/discovery/utils/network/search.py b/kolibri/core/discovery/utils/network/search.py
index 52b26af49e0..8549b9ef5d6 100644
--- a/kolibri/core/discovery/utils/network/search.py
+++ b/kolibri/core/discovery/utils/network/search.py
@@ -1,5 +1,7 @@
 import logging
 
+from kolibri.core.device.utils import get_device_setting
+from kolibri.core.discovery.models import DynamicNetworkLocation
 from kolibri.core.discovery.tasks import add_dynamic_network_location
 from kolibri.core.discovery.tasks import dispatch_broadcast_hooks
 from kolibri.core.discovery.tasks import generate_job_id
@@ -8,6 +10,7 @@
 from kolibri.core.discovery.tasks import TYPE_ADD
 from kolibri.core.discovery.tasks import TYPE_REMOVE
 from kolibri.core.discovery.utils.network.broadcast import KolibriInstanceListener
+from kolibri.core.tasks.job import Priority
 
 logger = logging.getLogger(__name__)
 
@@ -41,9 +44,25 @@ def add_instance(self, instance):
         """
         :type instance: kolibri.core.discovery.utils.network.broadcast.KolibriInstance
         """
+        priority = Priority.REGULAR
+        is_current_device_lod = get_device_setting("subset_of_users_device")
+        discovered_device = DynamicNetworkLocation.objects.filter(
+            broadcast_id=self.broadcast.id
+        ).first()
+
+        # If the current device is not an LOD,
+        # OR
+        # the current device is an LOD and the discovered device is not an LOD,
+        # then enqueue with high priority.
+        if (not is_current_device_lod) or (
+            is_current_device_lod and not discovered_device.subset_of_users_device
+        ):
+            priority = Priority.HIGH
+
         add_dynamic_network_location.enqueue(
             job_id=generate_job_id(TYPE_ADD, self.broadcast.id, instance.id),
             args=(self.broadcast.id, instance.to_dict()),
+            priority=priority,
         )
 
     def update_instance(self, instance):

From 024392884283ddd7421b19e0a07562ec87c4a9cb Mon Sep 17 00:00:00 2001
From: Vivek Agrawal <vivekmittalagrawal@gmail.com>
Date: Tue, 19 Sep 2023 20:49:44 +0530
Subject: [PATCH 10/53] Add another field to check on to

---
 kolibri/core/discovery/utils/network/search.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kolibri/core/discovery/utils/network/search.py b/kolibri/core/discovery/utils/network/search.py
index 8549b9ef5d6..123a79d21b8 100644
--- a/kolibri/core/discovery/utils/network/search.py
+++ b/kolibri/core/discovery/utils/network/search.py
@@ -47,7 +47,7 @@ def add_instance(self, instance):
         priority = Priority.REGULAR
         is_current_device_lod = get_device_setting("subset_of_users_device")
         discovered_device = DynamicNetworkLocation.objects.filter(
-            broadcast_id=self.broadcast.id
+            broadcast_id=self.broadcast.id, pk=instance.zeroconf_id
         ).first()
 
         # If the current device is not an LOD,

From 0fbacd7c4d0b9f68c1da4d530c8e85a97dea4dd3 Mon Sep 17 00:00:00 2001
From: Vivek Agrawal <vivekmittalagrawal@gmail.com>
Date: Tue, 19 Sep 2023 21:37:59 +0530
Subject: [PATCH 11/53] Don't access db

---
 kolibri/core/discovery/utils/network/search.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/kolibri/core/discovery/utils/network/search.py b/kolibri/core/discovery/utils/network/search.py
index 123a79d21b8..3f15f1bb8be 100644
--- a/kolibri/core/discovery/utils/network/search.py
+++ b/kolibri/core/discovery/utils/network/search.py
@@ -1,7 +1,5 @@
 import logging
 
-from kolibri.core.device.utils import get_device_setting
-from kolibri.core.discovery.models import DynamicNetworkLocation
 from kolibri.core.discovery.tasks import add_dynamic_network_location
 from kolibri.core.discovery.tasks import dispatch_broadcast_hooks
 from kolibri.core.discovery.tasks import generate_job_id
@@ -45,17 +43,17 @@ def add_instance(self, instance):
         :type instance: kolibri.core.discovery.utils.network.broadcast.KolibriInstance
         """
         priority = Priority.REGULAR
-        is_current_device_lod = get_device_setting("subset_of_users_device")
-        discovered_device = DynamicNetworkLocation.objects.filter(
-            broadcast_id=self.broadcast.id, pk=instance.zeroconf_id
-        ).first()
+        is_current_device_lod = self.broadcast.instance.device_info.get(
+            "subset_of_users_device"
+        )
+        is_discovered_device_lod = instance.device_info.get("subset_of_users_device")
 
         # If the current device is not an LOD,
         # OR
         # the current device is an LOD and the discovered device is not an LOD,
         # then enqueue with high priority.
         if (not is_current_device_lod) or (
-            is_current_device_lod and not discovered_device.subset_of_users_device
+            is_current_device_lod and not is_discovered_device_lod
         ):
             priority = Priority.HIGH
 

From f425a79f3b63e07955c27348b6ca78342158c80a Mon Sep 17 00:00:00 2001
From: Vivek Agrawal <vivekmittalagrawal@gmail.com>
Date: Tue, 19 Sep 2023 21:53:27 +0530
Subject: [PATCH 12/53] Fix outdated test

---
 kolibri/core/discovery/test/test_network_search.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kolibri/core/discovery/test/test_network_search.py b/kolibri/core/discovery/test/test_network_search.py
index 04ae52f28df..a98cbd5f631 100644
--- a/kolibri/core/discovery/test/test_network_search.py
+++ b/kolibri/core/discovery/test/test_network_search.py
@@ -3,7 +3,7 @@
 
 from ..utils.network.broadcast import KolibriInstance
 from ..utils.network.search import NetworkLocationListener
-
+from kolibri.core.tasks.job import Priority
 
 MOCK_INTERFACE_IP = "111.222.111.222"
 MOCK_PORT = 555
@@ -38,6 +38,7 @@ def test_add_instance(self, mock_enqueue):
         mock_enqueue.assert_called_once_with(
             job_id="9e89d3ea5256721c9cd631eac36feafe",
             args=(self.mock_broadcast.id, self.instance.to_dict()),
+            priority=Priority.HIGH
         )
 
     @mock.patch(SEARCH_MODULE + "add_dynamic_network_location.enqueue")

From ab03b39f557a9ae09eca43620c740d6faaedf936 Mon Sep 17 00:00:00 2001
From: Vivek Agrawal <vivekmittalagrawal@gmail.com>
Date: Tue, 19 Sep 2023 22:16:01 +0530
Subject: [PATCH 13/53] Rectify update_instance as well with tests

---
 .../core/discovery/test/test_network_search.py    |  3 ++-
 kolibri/core/discovery/utils/network/search.py    | 15 +++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/kolibri/core/discovery/test/test_network_search.py b/kolibri/core/discovery/test/test_network_search.py
index a98cbd5f631..7e09e1ffb59 100644
--- a/kolibri/core/discovery/test/test_network_search.py
+++ b/kolibri/core/discovery/test/test_network_search.py
@@ -38,7 +38,7 @@ def test_add_instance(self, mock_enqueue):
         mock_enqueue.assert_called_once_with(
             job_id="9e89d3ea5256721c9cd631eac36feafe",
             args=(self.mock_broadcast.id, self.instance.to_dict()),
-            priority=Priority.HIGH
+            priority=Priority.HIGH,
         )
 
     @mock.patch(SEARCH_MODULE + "add_dynamic_network_location.enqueue")
@@ -47,6 +47,7 @@ def test_update_instance(self, mock_enqueue):
         mock_enqueue.assert_called_once_with(
             job_id="9e89d3ea5256721c9cd631eac36feafe",
             args=(self.mock_broadcast.id, self.instance.to_dict()),
+            priority=Priority.HIGH,
         )
 
     @mock.patch(SEARCH_MODULE + "remove_dynamic_network_location.enqueue")
diff --git a/kolibri/core/discovery/utils/network/search.py b/kolibri/core/discovery/utils/network/search.py
index 3f15f1bb8be..c46fc3beccd 100644
--- a/kolibri/core/discovery/utils/network/search.py
+++ b/kolibri/core/discovery/utils/network/search.py
@@ -38,10 +38,7 @@ def unregister_instance(self, instance):
         # when we stop broadcasting, enqueue task to reset all connection states
         reset_connection_states.enqueue(args=(self.broadcast.id,))
 
-    def add_instance(self, instance):
-        """
-        :type instance: kolibri.core.discovery.utils.network.broadcast.KolibriInstance
-        """
+    def _get_dynamic_network_location_task_priority(self, instance):
         priority = Priority.REGULAR
         is_current_device_lod = self.broadcast.instance.device_info.get(
             "subset_of_users_device"
@@ -56,6 +53,13 @@ def add_instance(self, instance):
             is_current_device_lod and not is_discovered_device_lod
         ):
             priority = Priority.HIGH
+        return priority
+
+    def add_instance(self, instance):
+        """
+        :type instance: kolibri.core.discovery.utils.network.broadcast.KolibriInstance
+        """
+        priority = self._get_dynamic_network_location_task_priority(instance)
 
         add_dynamic_network_location.enqueue(
             job_id=generate_job_id(TYPE_ADD, self.broadcast.id, instance.id),
@@ -69,9 +73,12 @@ def update_instance(self, instance):
         """
         # enqueue as 'add' because update event could fire immediately after 'add', so this dedupes
         # the tasks, and it also doesn't do anything differently anyway
+        priority = self._get_dynamic_network_location_task_priority(instance)
+
         add_dynamic_network_location.enqueue(
             job_id=generate_job_id(TYPE_ADD, self.broadcast.id, instance.id),
             args=(self.broadcast.id, instance.to_dict()),
+            priority=priority,
         )
 
     def remove_instance(self, instance):

From fdd49bdd742542093fd324b32aed222057348035 Mon Sep 17 00:00:00 2001
From: shivangrawat30 <rawatshivang30@gmail.com>
Date: Tue, 19 Sep 2023 22:45:46 +0530
Subject: [PATCH 14/53] solved Navigation issue from attached drive

Signed-off-by: shivangrawat30 <rawatshivang30@gmail.com>
---
 .../plugins/device/assets/src/views/SelectContentPage/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
index 33ac0fbdb4e..2314874fe9c 100644
--- a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
@@ -173,7 +173,7 @@
         return title;
       },
       backRoute() {
-        return { name: ContentWizardPages.AVAILABLE_CHANNELS };
+        return { name: PageNames.MANAGE_CONTENT_PAGE };
       },
       channelId() {
         return this.$route.params.channel_id;

From 481c37b22514830c968174b891a3b625f04b1b3d Mon Sep 17 00:00:00 2001
From: Vivek Agrawal <vivekmittalagrawal@gmail.com>
Date: Mon, 25 Sep 2023 16:49:21 +0530
Subject: [PATCH 15/53] Add tests and a bit clean

---
 .../discovery/test/test_network_search.py     | 71 ++++++++++++++++---
 .../core/discovery/utils/network/search.py    |  6 +-
 2 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/kolibri/core/discovery/test/test_network_search.py b/kolibri/core/discovery/test/test_network_search.py
index 7e09e1ffb59..d1180cfb887 100644
--- a/kolibri/core/discovery/test/test_network_search.py
+++ b/kolibri/core/discovery/test/test_network_search.py
@@ -1,6 +1,7 @@
 import mock
 from django.test import TransactionTestCase
 
+from ..utils.network.broadcast import KolibriBroadcast
 from ..utils.network.broadcast import KolibriInstance
 from ..utils.network.search import NetworkLocationListener
 from kolibri.core.tasks.job import Priority
@@ -9,6 +10,10 @@
 MOCK_PORT = 555
 MOCK_ID = "abba"
 SEARCH_MODULE = "kolibri.core.discovery.utils.network.search."
+DYNAMIC_NETWORK_LOCATION_TASK_PRIORITY_METHOD = (
+    SEARCH_MODULE
+    + "NetworkLocationListener._get_dynamic_network_location_task_priority"
+)
 
 
 class NetworkLocationListenerTestCase(TransactionTestCase):
@@ -24,30 +29,76 @@ def setUp(self):
                 "instance_id": MOCK_ID,
             },
         )
-        self.mock_broadcast = mock.MagicMock(id="abc123")
-        self.listener = NetworkLocationListener(self.mock_broadcast)
+        self.broadcast_instance = KolibriInstance(
+            "abcd",
+            ip=MOCK_INTERFACE_IP,
+            port=MOCK_PORT,
+            device_info={
+                "instance_id": "abcd",
+            },
+        )
+
+        self.broadcast = KolibriBroadcast(instance=self.broadcast_instance)
+        self.broadcast.id = "abc123"
+
+        self.listener = NetworkLocationListener(self.broadcast)
 
     @mock.patch(SEARCH_MODULE + "reset_connection_states.enqueue")
     def test_register_instance(self, mock_enqueue):
         self.listener.register_instance(self.instance)
-        mock_enqueue.assert_called_once_with(args=(self.mock_broadcast.id,))
+        mock_enqueue.assert_called_once_with(args=(self.broadcast.id,))
+
+    def test_dynamic_network_location_task_priority_self_no_lod(self):
+        # The current device is not a LOD.
+        self.broadcast_instance.device_info["subset_of_users_device"] = False
+
+        priority = self.listener._get_dynamic_network_location_task_priority(
+            self.instance
+        )
+        self.assertEqual(priority, Priority.HIGH)
+
+    def test_dynamic_network_location_task_priority_self_discovered_both_lod(self):
+        # The current device is a LOD.
+        self.broadcast_instance.device_info["subset_of_users_device"] = True
+        # The discovered device is LOD as well.
+        self.instance.device_info["subset_of_users_device"] = True
+
+        priority = self.listener._get_dynamic_network_location_task_priority(
+            self.instance
+        )
+        self.assertEqual(priority, Priority.REGULAR)
+
+    def test_dynamic_network_location_task_priority_self_lod_discovered_not_lod(self):
+        # The current device is a LOD.
+        self.broadcast_instance.device_info["subset_of_users_device"] = True
+        # The discovered device is not a LOD.
+        self.instance.device_info["subset_of_users_device"] = False
+
+        priority = self.listener._get_dynamic_network_location_task_priority(
+            self.instance
+        )
+        self.assertEqual(priority, Priority.HIGH)
 
     @mock.patch(SEARCH_MODULE + "add_dynamic_network_location.enqueue")
-    def test_add_instance(self, mock_enqueue):
+    @mock.patch(DYNAMIC_NETWORK_LOCATION_TASK_PRIORITY_METHOD)
+    def test_add_instance(self, mock_priority_method, mock_enqueue):
         self.listener.add_instance(self.instance)
+        mock_priority_method.assert_called_once_with(self.instance)
         mock_enqueue.assert_called_once_with(
             job_id="9e89d3ea5256721c9cd631eac36feafe",
-            args=(self.mock_broadcast.id, self.instance.to_dict()),
-            priority=Priority.HIGH,
+            args=(self.broadcast.id, self.instance.to_dict()),
+            priority=mock_priority_method(),
         )
 
     @mock.patch(SEARCH_MODULE + "add_dynamic_network_location.enqueue")
-    def test_update_instance(self, mock_enqueue):
+    @mock.patch(DYNAMIC_NETWORK_LOCATION_TASK_PRIORITY_METHOD)
+    def test_update_instance(self, mock_priority_method, mock_enqueue):
         self.listener.update_instance(self.instance)
+        mock_priority_method.assert_called_once_with(self.instance)
         mock_enqueue.assert_called_once_with(
             job_id="9e89d3ea5256721c9cd631eac36feafe",
-            args=(self.mock_broadcast.id, self.instance.to_dict()),
-            priority=Priority.HIGH,
+            args=(self.broadcast.id, self.instance.to_dict()),
+            priority=mock_priority_method(),
         )
 
     @mock.patch(SEARCH_MODULE + "remove_dynamic_network_location.enqueue")
@@ -55,5 +106,5 @@ def test_remove_instance(self, mock_enqueue):
         self.listener.remove_instance(self.instance)
         mock_enqueue.assert_called_once_with(
             job_id="c5e88d1cb4a342ad3d23081022248fbc",
-            args=(self.mock_broadcast.id, self.instance.to_dict()),
+            args=(self.broadcast.id, self.instance.to_dict()),
         )
diff --git a/kolibri/core/discovery/utils/network/search.py b/kolibri/core/discovery/utils/network/search.py
index c46fc3beccd..3a21c84fb92 100644
--- a/kolibri/core/discovery/utils/network/search.py
+++ b/kolibri/core/discovery/utils/network/search.py
@@ -41,9 +41,11 @@ def unregister_instance(self, instance):
     def _get_dynamic_network_location_task_priority(self, instance):
         priority = Priority.REGULAR
         is_current_device_lod = self.broadcast.instance.device_info.get(
-            "subset_of_users_device"
+            "subset_of_users_device", False
+        )
+        is_discovered_device_lod = instance.device_info.get(
+            "subset_of_users_device", False
         )
-        is_discovered_device_lod = instance.device_info.get("subset_of_users_device")
 
         # If the current device is not an LOD,
         # OR

From 8b6cba89bae388c4f3a9aa61747f694308f7c6de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:19:23 +0000
Subject: [PATCH 16/53] Bump @babel/core from 7.22.20 to 7.23.0

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.20 to 7.23.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.0/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/kolibri-tools/package.json |   2 +-
 yarn.lock                           | 101 ++++++++++++++--------------
 2 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/packages/kolibri-tools/package.json b/packages/kolibri-tools/package.json
index e9b84500dac..6113b820ca7 100644
--- a/packages/kolibri-tools/package.json
+++ b/packages/kolibri-tools/package.json
@@ -14,7 +14,7 @@
     "build-kolibri-tools": "node ./build_kolibri_tools.js"
   },
   "dependencies": {
-    "@babel/core": "^7.22.20",
+    "@babel/core": "^7.23.0",
     "@babel/plugin-syntax-import-assertions": "^7.22.5",
     "@babel/plugin-transform-runtime": "^7.22.15",
     "@babel/preset-env": "^7.22.20",
diff --git a/yarn.lock b/yarn.lock
index 1dfa10a3d08..80a1bf8ecb0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -35,33 +35,33 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.20.tgz#8df6e96661209623f1975d66c35ffca66f3306d0"
   integrity sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==
 
-"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.20.tgz#e3d0eed84c049e2a2ae0a64d27b6a37edec385b7"
-  integrity sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA==
+"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.0.tgz#f8259ae0e52a123eb40f552551e647b506a94d83"
+  integrity sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
     "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.22.15"
+    "@babel/generator" "^7.23.0"
     "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-module-transforms" "^7.22.20"
-    "@babel/helpers" "^7.22.15"
-    "@babel/parser" "^7.22.16"
+    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helpers" "^7.23.0"
+    "@babel/parser" "^7.23.0"
     "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.22.20"
-    "@babel/types" "^7.22.19"
-    convert-source-map "^1.7.0"
+    "@babel/traverse" "^7.23.0"
+    "@babel/types" "^7.23.0"
+    convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.22.15", "@babel/generator@^7.7.2":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.15.tgz#1564189c7ec94cb8f77b5e8a90c4d200d21b2339"
-  integrity sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==
+"@babel/generator@^7.23.0", "@babel/generator@^7.7.2":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
+  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
   dependencies:
-    "@babel/types" "^7.22.15"
+    "@babel/types" "^7.23.0"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
@@ -174,6 +174,14 @@
     "@babel/template" "^7.22.5"
     "@babel/types" "^7.22.5"
 
+"@babel/helper-function-name@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
+  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
+  dependencies:
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
+
 "@babel/helper-hoist-variables@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
@@ -195,10 +203,10 @@
   dependencies:
     "@babel/types" "^7.22.15"
 
-"@babel/helper-module-transforms@^7.22.15", "@babel/helper-module-transforms@^7.22.20", "@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz#da9edc14794babbe7386df438f3768067132f59e"
-  integrity sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A==
+"@babel/helper-module-transforms@^7.22.15", "@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9", "@babel/helper-module-transforms@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e"
+  integrity sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==
   dependencies:
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-module-imports" "^7.22.15"
@@ -296,11 +304,6 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
   integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
 
-"@babel/helper-validator-identifier@^7.22.19":
-  version "7.22.19"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.19.tgz#2f34ab1e445f5b95e2e6edfe50ea2449e610583a"
-  integrity sha512-Tinq7ybnEPFFXhlYOYFiSjespWQk0dq2dRNAiMdRTOYQzEGqnnNyrTxPYHP5r6wGjlF1rFgABdDV0g8EwD6Qbg==
-
 "@babel/helper-validator-identifier@^7.22.20":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
@@ -335,14 +338,14 @@
     "@babel/template" "^7.22.5"
     "@babel/types" "^7.22.10"
 
-"@babel/helpers@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.15.tgz#f09c3df31e86e3ea0b7ff7556d85cdebd47ea6f1"
-  integrity sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==
+"@babel/helpers@^7.23.0":
+  version "7.23.1"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.1.tgz#44e981e8ce2b9e99f8f0b703f3326a4636c16d15"
+  integrity sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==
   dependencies:
     "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.22.15"
-    "@babel/types" "^7.22.15"
+    "@babel/traverse" "^7.23.0"
+    "@babel/types" "^7.23.0"
 
 "@babel/highlight@^7.10.4":
   version "7.18.6"
@@ -362,10 +365,10 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.22.15", "@babel/parser@^7.22.16":
-  version "7.22.16"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.16.tgz#180aead7f247305cce6551bea2720934e2fa2c95"
-  integrity sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
+  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.15":
   version "7.22.15"
@@ -1052,29 +1055,29 @@
     "@babel/parser" "^7.22.15"
     "@babel/types" "^7.22.15"
 
-"@babel/traverse@^7.22.15", "@babel/traverse@^7.22.20", "@babel/traverse@^7.22.5":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.20.tgz#db572d9cb5c79e02d83e5618b82f6991c07584c9"
-  integrity sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw==
+"@babel/traverse@^7.22.5", "@babel/traverse@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.0.tgz#18196ddfbcf4ccea324b7f6d3ada00d8c5a99c53"
+  integrity sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==
   dependencies:
     "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.22.15"
+    "@babel/generator" "^7.23.0"
     "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.22.16"
-    "@babel/types" "^7.22.19"
+    "@babel/parser" "^7.23.0"
+    "@babel/types" "^7.23.0"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
-  version "7.22.19"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.19.tgz#7425343253556916e440e662bb221a93ddb75684"
-  integrity sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==
+"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
+  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
   dependencies:
     "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.19"
+    "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
@@ -3981,7 +3984,7 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.5.1, convert-source-map@^1.6.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
   integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==

From 0df01d03a9cd7beb877b1e1a8bdf6068f1835cca Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Mon, 25 Sep 2023 18:25:46 -0700
Subject: [PATCH 17/53] Persist admin_imported flag across channel metadata
 upgrades.

---
 .../management/commands/importchannel.py      | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/kolibri/core/content/management/commands/importchannel.py b/kolibri/core/content/management/commands/importchannel.py
index 938ee7f3617..24c9780fed5 100644
--- a/kolibri/core/content/management/commands/importchannel.py
+++ b/kolibri/core/content/management/commands/importchannel.py
@@ -214,6 +214,20 @@ def progress_callback(bytes):
                         .exclude(kind=content_kinds.TOPIC)
                         .values_list("id", flat=True)
                     )
+                    admin_imported_ids = list(
+                        ContentNode.objects.filter(
+                            channel_id=channel_id, available=True, admin_imported=True
+                        )
+                        .exclude(kind=content_kinds.TOPIC)
+                        .values_list("id", flat=True)
+                    )
+                    not_admin_imported_ids = list(
+                        ContentNode.objects.filter(
+                            channel_id=channel_id, available=True, admin_imported=False
+                        )
+                        .exclude(kind=content_kinds.TOPIC)
+                        .values_list("id", flat=True)
+                    )
                     import_ran = import_channel_by_id(
                         channel_id, self.is_cancelled, contentfolder
                     )
@@ -221,6 +235,16 @@ def progress_callback(bytes):
                         if node_ids:
                             # annotate default channel db based on previously annotated leaf nodes
                             update_content_metadata(channel_id, node_ids=node_ids)
+                            if admin_imported_ids:
+                                # Reset admin_imported flag for nodes that were imported by admin
+                                ContentNode.objects.filter_by_uuids(
+                                    admin_imported_ids
+                                ).update(admin_imported=True)
+                            if not_admin_imported_ids:
+                                # Reset admin_imported flag for nodes that were not imported by admin
+                                ContentNode.objects.filter_by_uuids(
+                                    not_admin_imported_ids
+                                ).update(admin_imported=False)
                         else:
                             # ensure the channel is available to the frontend
                             ContentCacheKey.update_cache_key()

From 695c0781f63cabd2f5783f700ec9e6930bfa8744 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Tue, 26 Sep 2023 10:17:51 -0700
Subject: [PATCH 18/53] Add cautionary code comment.

---
 .../core/content/management/commands/importchannel.py    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/kolibri/core/content/management/commands/importchannel.py b/kolibri/core/content/management/commands/importchannel.py
index 24c9780fed5..59b17e07a94 100644
--- a/kolibri/core/content/management/commands/importchannel.py
+++ b/kolibri/core/content/management/commands/importchannel.py
@@ -206,6 +206,13 @@ def progress_callback(bytes):
             # if upgrading, import the channel
             if not no_upgrade:
                 try:
+                    # In each case we need to evaluate the queryset now,
+                    # in order to get node ids as they currently are before
+                    # the import. If we did not coerce each of these querysets
+                    # to a list now, they would be lazily evaluated after the
+                    # import, and would reflect the state of the database
+                    # after the import.
+
                     # evaluate list so we have the current node ids
                     node_ids = list(
                         ContentNode.objects.filter(
@@ -214,6 +221,7 @@ def progress_callback(bytes):
                         .exclude(kind=content_kinds.TOPIC)
                         .values_list("id", flat=True)
                     )
+                    # evaluate list so we have the current node ids
                     admin_imported_ids = list(
                         ContentNode.objects.filter(
                             channel_id=channel_id, available=True, admin_imported=True
@@ -221,6 +229,7 @@ def progress_callback(bytes):
                         .exclude(kind=content_kinds.TOPIC)
                         .values_list("id", flat=True)
                     )
+                    # evaluate list so we have the current node ids
                     not_admin_imported_ids = list(
                         ContentNode.objects.filter(
                             channel_id=channel_id, available=True, admin_imported=False

From 37a0d1935cd6c0180f0d2cafa1197a5e83b07672 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 00:40:13 +0000
Subject: [PATCH 19/53] Bump axios from 1.5.0 to 1.5.1

Bumps [axios](https://github.com/axios/axios) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.5.0...v1.5.1)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 kolibri/core/package.json                     | 2 +-
 packages/kolibri-core-for-export/package.json | 2 +-
 yarn.lock                                     | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kolibri/core/package.json b/kolibri/core/package.json
index 75dfe90e212..20f14f0ec62 100644
--- a/kolibri/core/package.json
+++ b/kolibri/core/package.json
@@ -7,7 +7,7 @@
     "@shopify/draggable": "^1.0.0-beta.8",
     "@vue/composition-api": "^1.7.2",
     "@vueuse/core": "^9.13.0",
-    "axios": "^1.5.0",
+    "axios": "^1.5.1",
     "clipboard": "^2.0.11",
     "core-js": "^3.32",
     "csv-generator-client": "^2.1.1",
diff --git a/packages/kolibri-core-for-export/package.json b/packages/kolibri-core-for-export/package.json
index c388acd74ce..ef1372316bd 100644
--- a/packages/kolibri-core-for-export/package.json
+++ b/packages/kolibri-core-for-export/package.json
@@ -10,7 +10,7 @@
     "@shopify/draggable": "^1.0.0-beta.8",
     "@vue/composition-api": "^1.7.2",
     "@vueuse/core": "^9.13.0",
-    "axios": "^1.5.0",
+    "axios": "^1.5.1",
     "clipboard": "^2.0.11",
     "core-js": "^3.32",
     "csv-generator-client": "^2.1.1",
diff --git a/yarn.lock b/yarn.lock
index 80a1bf8ecb0..d069ca1e594 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2538,10 +2538,10 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-axios@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.5.0.tgz#f02e4af823e2e46a9768cfc74691fdd0517ea267"
-  integrity sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ==
+axios@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.5.1.tgz#11fbaa11fc35f431193a9564109c88c1f27b585f"
+  integrity sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==
   dependencies:
     follow-redirects "^1.15.0"
     form-data "^4.0.0"

From eb9628b2a30ba15975b41164d714fba89811d9ec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 00:42:54 +0000
Subject: [PATCH 20/53] Bump glob from 10.3.7 to 10.3.9

Bumps [glob](https://github.com/isaacs/node-glob) from 10.3.7 to 10.3.9.
- [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/node-glob/compare/v10.3.7...v10.3.9)

---
updated-dependencies:
- dependency-name: glob
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/kolibri-tools/package.json |  2 +-
 yarn.lock                           | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/kolibri-tools/package.json b/packages/kolibri-tools/package.json
index 6113b820ca7..cc641d6226c 100644
--- a/packages/kolibri-tools/package.json
+++ b/packages/kolibri-tools/package.json
@@ -48,7 +48,7 @@
     "espree": "9.6.1",
     "esquery": "^1.5.0",
     "express": "^4.18.2",
-    "glob": "^10.3.7",
+    "glob": "^10.3.9",
     "htmlhint": "^1.1.4",
     "ini": "^4.1.1",
     "jest": "^29.7.0",
diff --git a/yarn.lock b/yarn.lock
index 80a1bf8ecb0..9f3919532ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5887,13 +5887,13 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^10.3.7:
-  version "10.3.7"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.7.tgz#d5bd30a529c8c9b262fb4b217941f64ad90e25ac"
-  integrity sha512-wCMbE1m9Nx5yD9LYtgsVWq5VhHlk5WzJirw594qZR6AIvQYuHrdDtIktUVjQItalD53y7dqoedu9xP0u0WaxIQ==
+glob@^10.3.9:
+  version "10.3.9"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.9.tgz#181ae87640ecce9b2fc5b96e4e2d70b7c3629ab8"
+  integrity sha512-2tU/LKevAQvDVuVJ9pg9Yv9xcbSh+TqHuTaXTNbQwf+0kDl9Fm6bMovi4Nm5c8TVvfxo2LLcqCGtmO9KoJaGWg==
   dependencies:
     foreground-child "^3.1.0"
-    jackspeak "^2.0.3"
+    jackspeak "^2.3.5"
     minimatch "^9.0.1"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
     path-scurry "^1.10.1"
@@ -7015,10 +7015,10 @@ istanbul-reports@^3.1.3:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jackspeak@^2.0.3:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.1.5.tgz#9a6741037b58257dc92eb28e9c8f54d33a1c09ba"
-  integrity sha512-NeK3mbF9vwNS3SjhzlEfO6WREJqoKtCwLoUPoUVtGJrpecxN3ZxlDuF22MzNSbOk/AA/VFWi+nFMV89xkXh2og==
+jackspeak@^2.3.5:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.5.tgz#443f237f9eeeb0d7c6ec34835ef5289bb4acb068"
+  integrity sha512-Ratx+B8WeXLAtRJn26hrhY8S1+Jz6pxPMrkrdkgb/NstTNiqMhX0/oFVu5wX+g5n6JlEu2LPsDJmY8nRP4+alw==
   dependencies:
     "@isaacs/cliui" "^8.0.2"
   optionalDependencies:

From 9f4e579f478b8b9c9d47b5b8e8a40136ed122a6c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 00:43:27 +0000
Subject: [PATCH 21/53] Bump markdown-it from 13.0.1 to 13.0.2

Bumps [markdown-it](https://github.com/markdown-it/markdown-it) from 13.0.1 to 13.0.2.
- [Changelog](https://github.com/markdown-it/markdown-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/markdown-it/compare/13.0.1...13.0.2)

---
updated-dependencies:
- dependency-name: markdown-it
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 kolibri/core/package.json                     |  2 +-
 packages/kolibri-core-for-export/package.json |  2 +-
 yarn.lock                                     | 15 +++++----------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/kolibri/core/package.json b/kolibri/core/package.json
index 75dfe90e212..438c9f554a0 100644
--- a/kolibri/core/package.json
+++ b/kolibri/core/package.json
@@ -25,7 +25,7 @@
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.8.1",
-    "markdown-it": "13.0.1",
+    "markdown-it": "13.0.2",
     "path-to-regexp": "1.8.0",
     "screenfull": "^5.2.0",
     "shave": "^5.0.3",
diff --git a/packages/kolibri-core-for-export/package.json b/packages/kolibri-core-for-export/package.json
index c388acd74ce..d2d88b9861e 100644
--- a/packages/kolibri-core-for-export/package.json
+++ b/packages/kolibri-core-for-export/package.json
@@ -28,7 +28,7 @@
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.8.1",
-    "markdown-it": "13.0.1",
+    "markdown-it": "13.0.2",
     "path-to-regexp": "1.8.0",
     "screenfull": "^5.2.0",
     "shave": "^5.0.3",
diff --git a/yarn.lock b/yarn.lock
index 80a1bf8ecb0..6f2917bd11c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4759,16 +4759,11 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.2.tgz#ac74db0bba8d33808bbf36809c3a5c3683531436"
   integrity sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==
 
-entities@^4.2.0:
+entities@^4.2.0, entities@^4.3.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
   integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
-entities@^4.3.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
-  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
-
 entities@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
@@ -7962,10 +7957,10 @@ mark.js@^8.11.1:
   resolved "https://registry.yarnpkg.com/mark.js/-/mark.js-8.11.1.tgz#180f1f9ebef8b0e638e4166ad52db879beb2ffc5"
   integrity sha1-GA8fnr74sOY45BZq1S24eb6y/8U=
 
-markdown-it@13.0.1:
-  version "13.0.1"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.1.tgz#c6ecc431cacf1a5da531423fc6a42807814af430"
-  integrity sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==
+markdown-it@13.0.2:
+  version "13.0.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.2.tgz#1bc22e23379a6952e5d56217fbed881e0c94d536"
+  integrity sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==
   dependencies:
     argparse "^2.0.1"
     entities "~3.0.1"

From e1a79f92404634f6348eef02199c3c7b0303b95c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 00:44:14 +0000
Subject: [PATCH 22/53] Bump autoprefixer from 10.4.15 to 10.4.16

Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.4.15 to 10.4.16.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/10.4.15...10.4.16)

---
updated-dependencies:
- dependency-name: autoprefixer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/kolibri-tools/package.json |  2 +-
 yarn.lock                           | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/kolibri-tools/package.json b/packages/kolibri-tools/package.json
index 6113b820ca7..ecd9cc40680 100644
--- a/packages/kolibri-tools/package.json
+++ b/packages/kolibri-tools/package.json
@@ -21,7 +21,7 @@
     "@testing-library/jest-dom": "^6.1.3",
     "@vue/test-utils": "^1.3.6",
     "ast-traverse": "^0.1.1",
-    "autoprefixer": "10.4.15",
+    "autoprefixer": "10.4.16",
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "^29.7.0",
     "babel-loader": "^9.1.3",
diff --git a/yarn.lock b/yarn.lock
index 80a1bf8ecb0..5c009aa9c3a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2516,14 +2516,14 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@10.4.15:
-  version "10.4.15"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.15.tgz#a1230f4aeb3636b89120b34a1f513e2f6834d530"
-  integrity sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==
+autoprefixer@10.4.16:
+  version "10.4.16"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.16.tgz#fad1411024d8670880bdece3970aa72e3572feb8"
+  integrity sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==
   dependencies:
     browserslist "^4.21.10"
-    caniuse-lite "^1.0.30001520"
-    fraction.js "^4.2.0"
+    caniuse-lite "^1.0.30001538"
+    fraction.js "^4.3.6"
     normalize-range "^0.1.2"
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
@@ -3627,10 +3627,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001520, caniuse-lite@^1.0.30001524:
-  version "1.0.30001524"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001524.tgz#1e14bce4f43c41a7deaeb5ebfe86664fe8dadb80"
-  integrity sha512-Jj917pJtYg9HSJBF95HVX3Cdr89JUyLT4IZ8SvM5aDRni95swKgYi3TgYLH5hnGfPE/U1dg6IfZ50UsIlLkwSA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001524, caniuse-lite@^1.0.30001538:
+  version "1.0.30001539"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001539.tgz#325a387ab1ed236df2c12dc6cd43a4fff9903a44"
+  integrity sha512-hfS5tE8bnNiNvEOEkm8HElUHroYwlqMMENEzELymy77+tJ6m+gA2krtHl5hxJaj71OlpC2cHZbdSMX1/YEqEkA==
 
 chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.2:
   version "4.1.2"
@@ -5703,10 +5703,10 @@ forwarded@0.2.0:
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
-fraction.js@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
-  integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==
+fraction.js@^4.3.6:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.6.tgz#e9e3acec6c9a28cf7bc36cbe35eea4ceb2c5c92d"
+  integrity sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg==
 
 fractional@^1.0.0:
   version "1.0.0"

From 4f5d2d315e2c49ad2644936ef27109fd8e30ffa5 Mon Sep 17 00:00:00 2001
From: MisRob <robosovam@gmail.com>
Date: Wed, 27 Sep 2023 16:03:32 +0200
Subject: [PATCH 23/53] Replace temporary fork reference by the latest KDS

---
 kolibri/core/package.json                     | 2 +-
 packages/kolibri-core-for-export/package.json | 2 +-
 yarn.lock                                     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kolibri/core/package.json b/kolibri/core/package.json
index 4f670733492..7d2aa287593 100644
--- a/kolibri/core/package.json
+++ b/kolibri/core/package.json
@@ -21,7 +21,7 @@
     "js-cookie": "^3.0.5",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.2.0",
-    "kolibri-design-system": "https://github.com/MisRob/kolibri-design-system#cfd99deadd301aae83598afb5c6290085f8351fb",
+    "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#3ab9801a442b20ddf63248b17ca0d83fe21133fb",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.8.1",
diff --git a/packages/kolibri-core-for-export/package.json b/packages/kolibri-core-for-export/package.json
index 80a0516c012..400f1ae7bf6 100644
--- a/packages/kolibri-core-for-export/package.json
+++ b/packages/kolibri-core-for-export/package.json
@@ -24,7 +24,7 @@
     "js-cookie": "^3.0.5",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.2.0",
-    "kolibri-design-system": "https://github.com/MisRob/kolibri-design-system#cfd99deadd301aae83598afb5c6290085f8351fb",
+    "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#3ab9801a442b20ddf63248b17ca0d83fe21133fb",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.8.1",
diff --git a/yarn.lock b/yarn.lock
index d639bd50dae..e245fc2b520 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7645,9 +7645,9 @@ kolibri-constants@0.2.0:
   resolved "https://registry.yarnpkg.com/kolibri-constants/-/kolibri-constants-0.2.0.tgz#47c9d773894e23251ba5ac4db420822e45603142"
   integrity sha512-WYDMGDzB9gNxRbpX1O2cGe1HrJvLvSZGwMuAv6dqrxJgPf7iO+Hi40/1CXjHM7nk5CRt+hn5bqnMzCBmj1omPA==
 
-"kolibri-design-system@https://github.com/MisRob/kolibri-design-system#cfd99deadd301aae83598afb5c6290085f8351fb":
+"kolibri-design-system@https://github.com/learningequality/kolibri-design-system#3ab9801a442b20ddf63248b17ca0d83fe21133fb":
   version "1.3.0"
-  resolved "https://github.com/MisRob/kolibri-design-system#cfd99deadd301aae83598afb5c6290085f8351fb"
+  resolved "https://github.com/learningequality/kolibri-design-system#3ab9801a442b20ddf63248b17ca0d83fe21133fb"
   dependencies:
     aphrodite "https://github.com/learningequality/aphrodite/"
     autosize "^3.0.21"

From d86a484e93680edbb862dc06ba2b9936fc7af057 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Sep 2023 00:21:28 +0000
Subject: [PATCH 24/53] Bump glob from 10.3.9 to 10.3.10

Bumps [glob](https://github.com/isaacs/node-glob) from 10.3.9 to 10.3.10.
- [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/node-glob/compare/v10.3.9...v10.3.10)

---
updated-dependencies:
- dependency-name: glob
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/kolibri-tools/package.json | 2 +-
 yarn.lock                           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/kolibri-tools/package.json b/packages/kolibri-tools/package.json
index 28be9b397ab..9fb9abbbb59 100644
--- a/packages/kolibri-tools/package.json
+++ b/packages/kolibri-tools/package.json
@@ -48,7 +48,7 @@
     "espree": "9.6.1",
     "esquery": "^1.5.0",
     "express": "^4.18.2",
-    "glob": "^10.3.9",
+    "glob": "^10.3.10",
     "htmlhint": "^1.1.4",
     "ini": "^4.1.1",
     "jest": "^29.7.0",
diff --git a/yarn.lock b/yarn.lock
index 9b52e960a80..e8285840331 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5882,10 +5882,10 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^10.3.9:
-  version "10.3.9"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.9.tgz#181ae87640ecce9b2fc5b96e4e2d70b7c3629ab8"
-  integrity sha512-2tU/LKevAQvDVuVJ9pg9Yv9xcbSh+TqHuTaXTNbQwf+0kDl9Fm6bMovi4Nm5c8TVvfxo2LLcqCGtmO9KoJaGWg==
+glob@^10.3.10:
+  version "10.3.10"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
+  integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
   dependencies:
     foreground-child "^3.1.0"
     jackspeak "^2.3.5"

From ea1ee3613cac43737e85601796f255b21030934f Mon Sep 17 00:00:00 2001
From: Radina Matic <radina.matic@gmail.com>
Date: Wed, 27 Sep 2023 18:50:07 -0700
Subject: [PATCH 25/53] Fixed the reference for the missing string

---
 .../assets/src/views/plan/CoachExamsPage/index.vue    | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
index 7c5edbcab4f..300c607ce8e 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
@@ -119,19 +119,19 @@
           v-else-if="statusSelected.value === coachString('filterQuizStarted') &&
             !startedExams.length"
         >
-          {{ $tr('noStartedExams') }}
+          {{ coreString('noResultsLabel') }}
         </p>
         <p
           v-else-if=" statusSelected.value === coachString('filterQuizNotStarted') &&
             !notStartedExams.length"
         >
-          {{ coreString('noResults') }}
+          {{ coreString('noResultsLabel') }}
         </p>
         <p
           v-else-if=" statusSelected.value === coachString('filterQuizEnded') &&
             !endedExams.length"
         >
-          {{ coreString('noResults') }}
+          {{ coreString('noResultsLabel') }}
         </p>
 
         <!-- Modals for Close & Open of quiz from right-most column -->
@@ -339,11 +339,6 @@
         message: 'You do not have any quizzes',
         context: 'Message displayed when there are no quizzes within a class.',
       },
-      noStartedExams: {
-        message: 'No started quizzes',
-        context:
-          'Message displayed when there are no started quizes. Started quizzes are those that are in progress.',
-      },
       newQuiz: {
         message: 'Create new quiz',
         context: "Title of the screen launched from the 'New quiz' button on the 'Plan' tab.\n",

From 601fcd08eb3f20b72e29392fec4a0960be42176a Mon Sep 17 00:00:00 2001
From: Radina Matic <radina.matic@gmail.com>
Date: Wed, 27 Sep 2023 19:31:30 -0700
Subject: [PATCH 26/53] No results for not visible lessons

---
 .../src/views/plan/LessonsRootPage/index.vue  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonsRootPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonsRootPage/index.vue
index 57a571d9607..e8bf41b0045 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/LessonsRootPage/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/LessonsRootPage/index.vue
@@ -89,7 +89,19 @@
           </template>
         </CoreTable>
 
-        <p v-if="!hasVisibleLessons">
+        <p
+          v-if="!hasVisibleLessons &&
+            lessons.length"
+        >
+
+          {{ coreString('noResultsLabel') }}
+        </p>
+
+        <p
+          v-if="!hasNotVisibleLessons &&
+            lessons.length"
+        >
+
           {{ coreString('noResultsLabel') }}
         </p>
 
@@ -242,6 +254,11 @@
           !this.activeLessonCounts.true && this.filterSelection.value === 'filterLessonVisible'
         );
       },
+      hasNotVisibleLessons() {
+        return !(
+          !this.activeLessonCounts.false && this.filterSelection.value === 'filterLessonNotVisible'
+        );
+      },
       calcTotalSizeOfVisibleLessons() {
         if (this.lessons && this.lessons.length) {
           const sum = this.lessons

From 0e0348a323256b8a8ca649a46f60c6cba9072b84 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Thu, 28 Sep 2023 16:29:49 -0700
Subject: [PATCH 27/53] Fixes performance regression. Uses capabilities to
 properly check if metered connection setting should be displayed.

---
 .../assets/src/modules/deviceInfo/index.js    |  3 ---
 .../plugins/device/assets/src/routes/index.js |  3 ---
 .../__test__/DeviceSettingsPage.spec.js       |  8 --------
 .../src/views/DeviceSettingsPage/index.vue    | 20 ++++++-------------
 4 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/kolibri/plugins/device/assets/src/modules/deviceInfo/index.js b/kolibri/plugins/device/assets/src/modules/deviceInfo/index.js
index fcb9cf225fc..4115383364d 100644
--- a/kolibri/plugins/device/assets/src/modules/deviceInfo/index.js
+++ b/kolibri/plugins/device/assets/src/modules/deviceInfo/index.js
@@ -26,9 +26,6 @@ export default {
     },
   },
   getters: {
-    getDeviceOS(state) {
-      return state.deviceInfo.os;
-    },
     getDataLoading(state) {
       return state.dataLoading;
     },
diff --git a/kolibri/plugins/device/assets/src/routes/index.js b/kolibri/plugins/device/assets/src/routes/index.js
index 1daddd02c84..cae3e2f95b5 100644
--- a/kolibri/plugins/device/assets/src/routes/index.js
+++ b/kolibri/plugins/device/assets/src/routes/index.js
@@ -137,9 +137,6 @@ const routes = [
     path: '/settings',
     handler: ({ name }) => {
       store.dispatch('preparePage', { name });
-      if (store.getters['deviceInfo/getDeviceOS'] === undefined) {
-        showDeviceInfoPage(store).then(hideLoadingScreen);
-      }
     },
   },
   {
diff --git a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/__test__/DeviceSettingsPage.spec.js b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/__test__/DeviceSettingsPage.spec.js
index 1942dffecbc..50d0e053e17 100644
--- a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/__test__/DeviceSettingsPage.spec.js
+++ b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/__test__/DeviceSettingsPage.spec.js
@@ -61,14 +61,6 @@ const store = new Vuex.Store({
   actions: {
     createSnackbar() {},
   },
-  modules: {
-    deviceInfo: {
-      namespaced: true,
-      getters: {
-        getDeviceOS: () => 'linux',
-      },
-    },
-  },
 });
 
 async function makeWrapper() {
diff --git a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue
index 8c3c3069a6f..969a2eeaad3 100644
--- a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue
@@ -109,7 +109,7 @@
           </div>
         </div>
 
-        <div v-if="deviceIsAndroid" class="fieldset">
+        <div v-if="canCheckMeteredConnection" class="fieldset">
           <h2>
             <label>{{ $tr('allowDownloadOnMeteredConnection') }}</label>
           </h2>
@@ -285,7 +285,7 @@
         </ul>
       </section>
 
-      <section v-if="deviceIsAndroid || isAppContext" class="android-bar">
+      <section v-if="isAppContext" class="android-bar">
         <KButton
           :text="coreString('saveChangesAction')"
           appearance="raised-button"
@@ -344,7 +344,6 @@
 
 <script>
 
-  import store from 'kolibri.coreVue.vuex.store';
   import { mapGetters } from 'vuex';
   import find from 'lodash/find';
   import urls from 'kolibri.urls';
@@ -355,13 +354,13 @@
   import sortLanguages from 'kolibri.utils.sortLanguages';
   import bytesForHumans from 'kolibri.utils.bytesForHumans';
   import BottomAppBar from 'kolibri.coreVue.components.BottomAppBar';
+  import { checkCapability } from 'kolibri.utils.appCapabilities';
   import commonDeviceStrings from '../commonDeviceStrings';
   import DeviceAppBarPage from '../DeviceAppBarPage';
   import { LandingPageChoices, MeteredConnectionDownloadOptions } from '../../constants';
   import { getFreeSpaceOnServer } from '../AvailableChannelsPage/api';
   import useDeviceRestart from '../../composables/useDeviceRestart';
   import usePlugins from '../../composables/usePlugins';
-  import { showDeviceInfoPage } from '../../modules/deviceInfo/handlers';
   import { getDeviceSettings, getPathsPermissions, saveDeviceSettings, getDeviceURLs } from './api';
   import PrimaryStorageLocationModal from './PrimaryStorageLocationModal';
   import AddStorageLocationModal from './AddStorageLocationModal';
@@ -460,7 +459,7 @@
     },
     computed: {
       ...mapGetters(['isAppContext', 'isPageLoading']),
-      ...mapGetters('deviceInfo', ['getDeviceOS', 'canRestart', 'isRemoteContent']),
+      ...mapGetters('deviceInfo', ['canRestart', 'isRemoteContent']),
       pageTitle() {
         return this.deviceString('deviceManagementTitle');
       },
@@ -537,16 +536,9 @@
           };
         }
       },
-      deviceIsAndroid() {
-        if (this.deviceInfo === undefined) {
-          showDeviceInfoPage(store);
-        }
-        if (this.getDeviceOS === undefined) {
-          return true;
-        }
-        return this.getDeviceOS.includes('Android');
+      canCheckMeteredConnection() {
+        return checkCapability('check_is_metered');
       },
-
       showDisabledAlert() {
         return this.isRemoteContent || !this.canRestart;
       },

From c78ab9f2fc591c554dcbc81410cd5212dba410b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 29 Sep 2023 00:39:45 +0000
Subject: [PATCH 28/53] Bump postcss-scss from 4.0.8 to 4.0.9

Bumps [postcss-scss](https://github.com/postcss/postcss-scss) from 4.0.8 to 4.0.9.
- [Changelog](https://github.com/postcss/postcss-scss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss-scss/compare/4.0.8...4.0.9)

---
updated-dependencies:
- dependency-name: postcss-scss
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/kolibri-tools/package.json | 2 +-
 yarn.lock                           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/kolibri-tools/package.json b/packages/kolibri-tools/package.json
index 9fb9abbbb59..1c65ed13e2d 100644
--- a/packages/kolibri-tools/package.json
+++ b/packages/kolibri-tools/package.json
@@ -61,7 +61,7 @@
     "postcss-less": "^6.0.0",
     "postcss-loader": "^7.3.3",
     "postcss-sass": "^0.5.0",
-    "postcss-scss": "^4.0.8",
+    "postcss-scss": "^4.0.9",
     "prettier": "^1.18.2",
     "process": "^0.11.10",
     "query-ast": "^1.0.5",
diff --git a/yarn.lock b/yarn.lock
index e8285840331..bfb81851ee3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9189,10 +9189,10 @@ postcss-sass@^0.5.0:
     gonzales-pe "^4.3.0"
     postcss "^8.2.14"
 
-postcss-scss@^4.0.2, postcss-scss@^4.0.6, postcss-scss@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.8.tgz#12a4991a902a782d4e9b86b1f217d5181c6c4f32"
-  integrity sha512-Cr0X8Eu7xMhE96PJck6ses/uVVXDtE5ghUTKNUYgm8ozgP2TkgV3LWs3WgLV1xaSSLq8ZFiXaUrj0LVgG1fGEA==
+postcss-scss@^4.0.2, postcss-scss@^4.0.6, postcss-scss@^4.0.9:
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.9.tgz#a03c773cd4c9623cb04ce142a52afcec74806685"
+  integrity sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==
 
 postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.13, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.7:
   version "6.0.13"

From c12d14349d2450c5bd8a5b4fc898880ffbf94912 Mon Sep 17 00:00:00 2001
From: Otodi Allan <otodi.allan1@gmail.com>
Date: Thu, 14 Sep 2023 19:35:15 +0300
Subject: [PATCH 29/53] Disabling additional user import until multiple user
 syncing is working

---
 .../assets/src/views/ImportMultipleUsers.vue  | 12 ++++++
 .../assets/src/views/LoadingTaskPage.vue      | 37 ++++++++++++-------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue b/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue
index a6a1e1bbdee..3d7a8f56a0e 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue
@@ -32,6 +32,7 @@
               v-if="!isImported(userRow.user) && !isImporting(userRow.user)"
               :text="coreString('importAction')"
               appearance="flat-button"
+              :disabled="isImportingUserDisabled"
               @click="startImport(userRow.user)"
             />
             <KCircularLoader
@@ -91,6 +92,8 @@
         isPolling: false,
         // array of user/learner ids
         learnersBeingImported: [],
+        // To be removed
+        isImportingUserDisabled: false,
       };
     },
     inject: ['wizardService'],
@@ -140,6 +143,7 @@
     beforeMount() {
       this.isPolling = true;
       this.pollImportTask();
+      this.checkImportedUser();
     },
     methods: {
       importedLearners() {
@@ -186,6 +190,7 @@
         }
       },
       startImport(learner) {
+        this.isImportingUserDisabled = true;
         // Push the learner into being imported, we'll remove it if we get an error later on
         this.learnersBeingImported.push(learner.id);
 
@@ -207,14 +212,21 @@
         }
         TaskResource.startTask(params).catch(() => {
           this.learnersBeingImported = this.learnersBeingImported.filter(id => id != learner.id);
+          this.isImportingUserDisabled = false;
         });
       },
       isImported(learner) {
         return this.importedLearners().find(u => u === learner.username);
       },
       isImporting(learner) {
+        this.checkImportedUser(learner);
         return this.learnersBeingImported.includes(learner.id);
       },
+      checkImportedUser(learner) {
+        if (this.learnersBeingImported.length > 0 || this.isImported(learner)) {
+          this.isImportingUserDisabled = true;
+        }
+      },
     },
     $trs: {
       commaSeparatedPair: {
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/LoadingTaskPage.vue b/kolibri/plugins/setup_wizard/assets/src/views/LoadingTaskPage.vue
index 6511bdfc2f6..5071632bd26 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/LoadingTaskPage.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/LoadingTaskPage.vue
@@ -35,12 +35,13 @@
       </template>
       <span v-else></span>
     </template>
-    <KButton
+    <!-- To DO: to be roled back when multiple user syncing is working in the upcoming release -->
+    <!-- <KButton
       v-if="loadingTask.status === 'COMPLETED' && isImportingSoud"
       appearance="basic-link"
       :text="$tr('importAnother')"
       @click="importAnother"
-    />
+    /> -->
   </OnboardingStepBase>
 
 </template>
@@ -53,7 +54,12 @@
   import commonSyncElements from 'kolibri.coreVue.mixins.commonSyncElements';
   import { TaskResource } from 'kolibri.resources';
   import { TaskStatuses } from 'kolibri.utils.syncTaskUtils';
-  import { DeviceTypePresets, LodTypePresets, SoudQueue, FooterMessageTypes } from '../constants';
+  import {
+    DeviceTypePresets,
+    // LodTypePresets,
+    SoudQueue,
+    FooterMessageTypes,
+  } from '../constants';
   import OnboardingStepBase from './OnboardingStepBase';
 
   export default {
@@ -124,9 +130,10 @@
       isSoud() {
         return this.queue === SoudQueue;
       },
-      isImportingSoud() {
-        return this.wizardService.state.context.lodImportOrJoin === LodTypePresets.IMPORT;
-      },
+      // To Do: role this back when multiple user syncing is working in the upcoming release!
+      // isImportingSoud() {
+      //   return this.wizardService.state.context.lodImportOrJoin === LodTypePresets.IMPORT;
+      // },
       queue() {
         return this.wizardService.state.context.fullOrLOD === DeviceTypePresets.LOD
           ? SoudQueue
@@ -143,10 +150,11 @@
       this.pollTask();
     },
     methods: {
-      importAnother() {
-        this.isPolling = false;
-        this.wizardService.send('IMPORT_ANOTHER');
-      },
+      // To Do: role this back when multiple user syncing is working in the upcoming release!
+      // importAnother() {
+      //   this.isPolling = false;
+      //   this.wizardService.send('IMPORT_ANOTHER');
+      // },
       pushCompletedToWizardMachine() {
         this.completedTasks.forEach(task => {
           if (!this.wizardService.state.context.importedUsers.includes(task.username)) {
@@ -226,10 +234,11 @@
       },
     },
     $trs: {
-      importAnother: {
-        message: 'Import another user account',
-        context: 'Link to restart the import step for another user. ',
-      },
+      // To Do: role this back when multiple user syncing is working in the upcoming release!
+      // importAnother: {
+      //   message: 'Import another user account',
+      //   context: 'Link to restart the import step for another user. ',
+      // },
       loadUserTitle: {
         message: 'Load user account',
         context: 'Title of a page where user is waiting for a user to be imported',

From 9b355e3e55b0c32f3f4ed74ac8b4de7a16321f38 Mon Sep 17 00:00:00 2001
From: Otodi Allan <otodi.allan1@gmail.com>
Date: Fri, 15 Sep 2023 23:07:52 +0300
Subject: [PATCH 30/53] added a route to the loading task page when a single
 user has been imported

---
 .../setup_wizard/assets/src/views/ImportMultipleUsers.vue      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue b/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue
index 3d7a8f56a0e..2be18df059f 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue
@@ -150,6 +150,9 @@
         return this.wizardService.state.context.importedUsers;
       },
       pollImportTask() {
+        if (this.wizardService.state.context.importedUsers.length > 0) {
+          this.wizardService.send('LOADING');
+        }
         TaskResource.list({ queue: SoudQueue }).then(tasks => {
           if (tasks.length) {
             tasks.forEach(task => {

From 43082580d70f6c1a7b1f54d548677850ba30c1e8 Mon Sep 17 00:00:00 2001
From: Otodi Allan <otodi.allan1@gmail.com>
Date: Fri, 15 Sep 2023 23:13:38 +0300
Subject: [PATCH 31/53] added a TO DO

---
 .../setup_wizard/assets/src/views/ImportMultipleUsers.vue        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue b/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue
index 2be18df059f..682af4947d9 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue
@@ -150,6 +150,7 @@
         return this.wizardService.state.context.importedUsers;
       },
       pollImportTask() {
+        // TO DO :: This has to be removed once the multiple user syncing has been fixed.
         if (this.wizardService.state.context.importedUsers.length > 0) {
           this.wizardService.send('LOADING');
         }

From 6d35989cc873bdf93db7c98a84dc73c7ecbfb61e Mon Sep 17 00:00:00 2001
From: Otodi Allan <otodi.allan1@gmail.com>
Date: Fri, 22 Sep 2023 20:48:33 +0300
Subject: [PATCH 32/53] routed a user away from the import users page
 onclicking the import button

---
 .../setup_wizard/assets/src/views/ImportMultipleUsers.vue    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue b/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue
index 682af4947d9..3a3598e9ff2 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue
@@ -151,7 +151,10 @@
       },
       pollImportTask() {
         // TO DO :: This has to be removed once the multiple user syncing has been fixed.
-        if (this.wizardService.state.context.importedUsers.length > 0) {
+        if (
+          this.learnersBeingImported.length > 0 ||
+          this.wizardService.state.context.importedUsers.length > 0
+        ) {
           this.wizardService.send('LOADING');
         }
         TaskResource.list({ queue: SoudQueue }).then(tasks => {

From 6efd729a97a3de9d8124c31ada34677d67274411 Mon Sep 17 00:00:00 2001
From: Otodi Allan <otodi.allan1@gmail.com>
Date: Fri, 29 Sep 2023 18:29:59 +0300
Subject: [PATCH 33/53] capitalized TODO text

---
 .../setup_wizard/assets/src/views/ImportMultipleUsers.vue | 2 +-
 .../setup_wizard/assets/src/views/LoadingTaskPage.vue     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue b/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue
index 3a3598e9ff2..4fcde188bf6 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/ImportMultipleUsers.vue
@@ -150,7 +150,7 @@
         return this.wizardService.state.context.importedUsers;
       },
       pollImportTask() {
-        // TO DO :: This has to be removed once the multiple user syncing has been fixed.
+        // TODO :: This has to be removed once the multiple user syncing has been fixed.
         if (
           this.learnersBeingImported.length > 0 ||
           this.wizardService.state.context.importedUsers.length > 0
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/LoadingTaskPage.vue b/kolibri/plugins/setup_wizard/assets/src/views/LoadingTaskPage.vue
index 5071632bd26..001a01e3853 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/LoadingTaskPage.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/LoadingTaskPage.vue
@@ -35,7 +35,7 @@
       </template>
       <span v-else></span>
     </template>
-    <!-- To DO: to be roled back when multiple user syncing is working in the upcoming release -->
+    <!-- TODO: to be roled back when multiple user syncing is working in the upcoming release -->
     <!-- <KButton
       v-if="loadingTask.status === 'COMPLETED' && isImportingSoud"
       appearance="basic-link"
@@ -130,7 +130,7 @@
       isSoud() {
         return this.queue === SoudQueue;
       },
-      // To Do: role this back when multiple user syncing is working in the upcoming release!
+      // TODO: role this back when multiple user syncing is working in the upcoming release!
       // isImportingSoud() {
       //   return this.wizardService.state.context.lodImportOrJoin === LodTypePresets.IMPORT;
       // },
@@ -150,7 +150,7 @@
       this.pollTask();
     },
     methods: {
-      // To Do: role this back when multiple user syncing is working in the upcoming release!
+      // TODO: role this back when multiple user syncing is working in the upcoming release!
       // importAnother() {
       //   this.isPolling = false;
       //   this.wizardService.send('IMPORT_ANOTHER');
@@ -234,7 +234,7 @@
       },
     },
     $trs: {
-      // To Do: role this back when multiple user syncing is working in the upcoming release!
+      // TODO: role this back when multiple user syncing is working in the upcoming release!
       // importAnother: {
       //   message: 'Import another user account',
       //   context: 'Link to restart the import step for another user. ',

From 9188e6ab7976cf414e93999f4551d76b3d693f6b Mon Sep 17 00:00:00 2001
From: Radina Matic <radina.matic@gmail.com>
Date: Fri, 29 Sep 2023 12:42:37 -0700
Subject: [PATCH 34/53] Imrproved naming for readability

---
 .../src/views/plan/LessonsRootPage/index.vue  | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonsRootPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonsRootPage/index.vue
index e8bf41b0045..72e80b42cfd 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/LessonsRootPage/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/LessonsRootPage/index.vue
@@ -89,19 +89,7 @@
           </template>
         </CoreTable>
 
-        <p
-          v-if="!hasVisibleLessons &&
-            lessons.length"
-        >
-
-          {{ coreString('noResultsLabel') }}
-        </p>
-
-        <p
-          v-if="!hasNotVisibleLessons &&
-            lessons.length"
-        >
-
+        <p v-if="showNoResultsLabel">
           {{ coreString('noResultsLabel') }}
         </p>
 
@@ -250,14 +238,21 @@
         return { name: LessonsPageNames.LESSON_CREATION_ROOT };
       },
       hasVisibleLessons() {
-        return !(
-          !this.activeLessonCounts.true && this.filterSelection.value === 'filterLessonVisible'
-        );
+        return this.activeLessonCounts.true;
+      },
+      hasNonVisibleLessons() {
+        return this.activeLessonCounts.false;
       },
-      hasNotVisibleLessons() {
-        return !(
-          !this.activeLessonCounts.false && this.filterSelection.value === 'filterLessonNotVisible'
-        );
+      showNoResultsLabel() {
+        if (!this.lessons.length) {
+          return false;
+        } else if (this.filterSelection.value === 'filterLessonVisible') {
+          return !this.hasVisibleLessons;
+        } else if (this.filterSelection.value === 'filterLessonNotVisible') {
+          return !this.hasNonVisibleLessons;
+        } else {
+          return false;
+        }
       },
       calcTotalSizeOfVisibleLessons() {
         if (this.lessons && this.lessons.length) {

From cd42526a25d37d1a5df5f0f8fd53bc761c7684c2 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Fri, 29 Sep 2023 16:54:26 -0700
Subject: [PATCH 35/53] Some minor linting fixes that became apparent after
 linting updates, backported here.

---
 .../assets/src/views/sortable/DragContainer.vue    |  7 ++-----
 .../src/views/home/HomePage/OverviewBlock.vue      |  2 +-
 .../LessonContentCard/BookmarkIcon.vue             |  2 +-
 .../assets/src/views/FacilitiesPage/index.vue      |  5 ++---
 .../plugins/learn/assets/src/views/CardList.vue    |  2 +-
 .../media_player/assets/src/utils/settings.js      | 14 +++++++-------
 6 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/kolibri/core/assets/src/views/sortable/DragContainer.vue b/kolibri/core/assets/src/views/sortable/DragContainer.vue
index f577418e7ea..7fb1e54585c 100644
--- a/kolibri/core/assets/src/views/sortable/DragContainer.vue
+++ b/kolibri/core/assets/src/views/sortable/DragContainer.vue
@@ -115,12 +115,9 @@
   }
 
   @keyframes bounce-in {
-    from {
-      animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
-    }
-
     0% {
       transform: scale3d(1.05, 1.05, 1.05);
+      animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
     }
 
     50% {
@@ -128,7 +125,7 @@
       animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
     }
 
-    to {
+    100% {
       transform: scale3d(1, 1, 1);
       animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
     }
diff --git a/kolibri/plugins/coach/assets/src/views/home/HomePage/OverviewBlock.vue b/kolibri/plugins/coach/assets/src/views/home/HomePage/OverviewBlock.vue
index dcd4a3c0492..de6374c8506 100644
--- a/kolibri/plugins/coach/assets/src/views/home/HomePage/OverviewBlock.vue
+++ b/kolibri/plugins/coach/assets/src/views/home/HomePage/OverviewBlock.vue
@@ -43,7 +43,7 @@
               :text="$tr('viewLearners')"
               appearance="basic-link"
               :to="classLearnersListRoute"
-              style="margin-left: 24 px;"
+              style="margin-left: 24px;"
             />
           </template>
         </template>
diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/LessonContentCard/BookmarkIcon.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/LessonContentCard/BookmarkIcon.vue
index 9059cbe0845..8876153d1ed 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/LessonContentCard/BookmarkIcon.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/LessonContentCard/BookmarkIcon.vue
@@ -2,7 +2,7 @@
 
   <KIcon
     icon="bookmark"
-    style="top:50;left:75; width: 34px; height: 34px;"
+    style="top: 50px;left: 75px; width: 34px; height: 34px;"
   />
 
 </template>
diff --git a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
index 6e6b94407fe..7c894beb031 100644
--- a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
@@ -40,7 +40,7 @@
             <template v-for="(facility, idx) in facilities">
               <tr
                 :key="idx"
-                style="border: none!important"
+                style="border: 0 !important"
               >
                 <td>
                   <FacilityNameAndSyncStatus
@@ -52,8 +52,7 @@
                   />
                 </td>
               </tr>
-              <!-- May cause error on device with > 10000 facilities... -->
-              <tr :key="idx + 10000">
+              <tr :key="idx + facilities.length">
                 <td style="padding: 0 0 16px 0;">
                   <!-- Gives most space possible to buttons and aligns them with text -->
                   <KButtonGroup style="margin-left: -16px; margin-right: -16px; max-width: 100%">
diff --git a/kolibri/plugins/learn/assets/src/views/CardList.vue b/kolibri/plugins/learn/assets/src/views/CardList.vue
index d0f2a5b98b4..ba1dc55e03c 100644
--- a/kolibri/plugins/learn/assets/src/views/CardList.vue
+++ b/kolibri/plugins/learn/assets/src/views/CardList.vue
@@ -37,7 +37,7 @@
               </h3>
               <p
                 v-if="contentNode.description"
-                style="font-size: 14px; marginTop: 4px; marginBottom: 4px;"
+                style="font-size: 14px; margin-top: 4px; margin-bottom: 4px;"
               >
                 <TextTruncatorCss :text="contentNode.description" :maxLines="2" />
               </p>
diff --git a/kolibri/plugins/media_player/assets/src/utils/settings.js b/kolibri/plugins/media_player/assets/src/utils/settings.js
index 08b8b8db5d1..a33e7ac7e80 100755
--- a/kolibri/plugins/media_player/assets/src/utils/settings.js
+++ b/kolibri/plugins/media_player/assets/src/utils/settings.js
@@ -14,7 +14,7 @@ class Settings {
   }
 
   set playerMuted(playerMuted) {
-    return this.save({ playerMuted });
+    this.save({ playerMuted });
   }
 
   get playerMuted() {
@@ -22,7 +22,7 @@ class Settings {
   }
 
   set playerRate(playerRate) {
-    return this.save({ playerRate });
+    this.save({ playerRate });
   }
 
   get playerRate() {
@@ -30,7 +30,7 @@ class Settings {
   }
 
   set playerVolume(playerVolume) {
-    return this.save({ playerVolume });
+    this.save({ playerVolume });
   }
 
   get playerVolume() {
@@ -38,7 +38,7 @@ class Settings {
   }
 
   set captionLanguage(captionLanguage) {
-    return this.save({ captionLanguage });
+    this.save({ captionLanguage });
   }
 
   get captionLanguage() {
@@ -46,7 +46,7 @@ class Settings {
   }
 
   set captionSubtitles(captionSubtitles) {
-    return this.save({ captionSubtitles });
+    this.save({ captionSubtitles });
   }
 
   get captionSubtitles() {
@@ -54,7 +54,7 @@ class Settings {
   }
 
   set captionTranscript(captionTranscript) {
-    return this.save({ captionTranscript });
+    this.save({ captionTranscript });
   }
 
   get captionTranscript() {
@@ -62,7 +62,7 @@ class Settings {
   }
 
   set videoLangCode(videoLangCode) {
-    return this.save({ videoLangCode });
+    this.save({ videoLangCode });
   }
 
   get videoLangCode() {

From 595ff11802c26e18277202c5625e67f93366ffdf Mon Sep 17 00:00:00 2001
From: Anup Haldar <haldaranup746@gmail.com>
Date: Fri, 29 Sep 2023 13:08:31 -0400
Subject: [PATCH 36/53] bugfix- birth year selction

---
 .../core/assets/src/views/userAccounts/BirthYearSelect.vue  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue b/kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue
index 6280f2c9f8c..eb1d5adc118 100644
--- a/kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue
+++ b/kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue
@@ -85,8 +85,12 @@
     methods: {
       makeYearOptions(max, min) {
         return range(max, min, -1).map(n => {
+          // Because of timezone, year could be mismatched when localized in any timezone that less than UTC
+          // for ex- 2022 will be shown instead of 2023
+          let date = new Date();
+          date.setFullYear(n);
           return {
-            label: this.$formatDate(String(n), { year: 'numeric' }),
+            label: this.$formatDate(String(date), { year: 'numeric' }),
             value: String(n),
           };
         });

From 8d0c6386da3334e9aa8af02352f416472a8ff0c1 Mon Sep 17 00:00:00 2001
From: shivangrawat30 <rawatshivang30@gmail.com>
Date: Sun, 1 Oct 2023 19:42:59 +0530
Subject: [PATCH 37/53] changed backRoute() in selectConentPage/index.js

Signed-off-by: shivangrawat30 <rawatshivang30@gmail.com>
---
 .../assets/src/views/SelectContentPage/index.vue     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
index 2314874fe9c..3db9a3c1895 100644
--- a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
@@ -100,6 +100,7 @@
   import ContentWizardUiAlert from './ContentWizardUiAlert';
   import { startImportTask } from './api';
   import plugin_data from 'plugin_data';
+  import { availableChannelsPageLink } from '../ManageContentPage/manageContentLinks';
 
   export default {
     name: 'SelectContentPage',
@@ -173,7 +174,16 @@
         return title;
       },
       backRoute() {
-        return { name: PageNames.MANAGE_CONTENT_PAGE };
+        if(this.inRemoteImportMode){
+          console.log("hello");
+          return availableChannelsPageLink();
+        }
+        else if(this.inPeerImportMode) {
+          return availableChannelsPageLink({addressId: this.selectedPeer.id})
+        }
+        else if(this.inLocalImportMode) { 
+          return availableChannelsPageLink({driveId: this.selectedDrive.id});
+        }
       },
       channelId() {
         return this.$route.params.channel_id;

From 3a7b39d2b085c304c16d1b279e7570dbb055adbe Mon Sep 17 00:00:00 2001
From: shivangrawat30 <rawatshivang30@gmail.com>
Date: Sun, 1 Oct 2023 19:45:24 +0530
Subject: [PATCH 38/53] minor change

Signed-off-by: shivangrawat30 <rawatshivang30@gmail.com>
---
 .../plugins/device/assets/src/views/SelectContentPage/index.vue  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
index 3db9a3c1895..09e81abe3d4 100644
--- a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
@@ -175,7 +175,6 @@
       },
       backRoute() {
         if(this.inRemoteImportMode){
-          console.log("hello");
           return availableChannelsPageLink();
         }
         else if(this.inPeerImportMode) {

From d0e141cbe2e30d45da9b1d2d17ea4b8c9fc9cc87 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 01:17:05 +0000
Subject: [PATCH 39/53] Bump core-js from 3.32.2 to 3.33.0

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.32.2 to 3.33.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.33.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 kolibri/core/package.json                     | 2 +-
 packages/hashi/package.json                   | 2 +-
 packages/kolibri-core-for-export/package.json | 2 +-
 yarn.lock                                     | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kolibri/core/package.json b/kolibri/core/package.json
index d492220498b..3c8a7c8386e 100644
--- a/kolibri/core/package.json
+++ b/kolibri/core/package.json
@@ -9,7 +9,7 @@
     "@vueuse/core": "^9.13.0",
     "axios": "^1.5.1",
     "clipboard": "^2.0.11",
-    "core-js": "^3.32",
+    "core-js": "^3.33",
     "csv-generator-client": "^2.1.1",
     "date-fns": "^1.28.2",
     "deep-object-diff": "^1.1.9",
diff --git a/packages/hashi/package.json b/packages/hashi/package.json
index aa4f02f571f..e8087be3124 100644
--- a/packages/hashi/package.json
+++ b/packages/hashi/package.json
@@ -22,7 +22,7 @@
     "purgecss": "^5.0.0"
   },
   "dependencies": {
-    "core-js": "3.32",
+    "core-js": "3.33",
     "dayjs": "^1.11.10",
     "fflate": "^0.8.1",
     "iri": "^1.3.1",
diff --git a/packages/kolibri-core-for-export/package.json b/packages/kolibri-core-for-export/package.json
index 9bf6cac891c..fefa0a676f4 100644
--- a/packages/kolibri-core-for-export/package.json
+++ b/packages/kolibri-core-for-export/package.json
@@ -12,7 +12,7 @@
     "@vueuse/core": "^9.13.0",
     "axios": "^1.5.1",
     "clipboard": "^2.0.11",
-    "core-js": "^3.32",
+    "core-js": "^3.33",
     "csv-generator-client": "^2.1.1",
     "date-fns": "^1.28.2",
     "deep-object-diff": "^1.1.9",
diff --git a/yarn.lock b/yarn.lock
index bfb81851ee3..477711d906e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4013,10 +4013,10 @@ core-js-compat@^3.31.0:
   dependencies:
     browserslist "^4.21.9"
 
-core-js@3.32, core-js@^3, core-js@^3.32:
-  version "3.32.2"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.32.2.tgz#172fb5949ef468f93b4be7841af6ab1f21992db7"
-  integrity sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ==
+core-js@3.33, core-js@^3, core-js@^3.33:
+  version "3.33.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.33.0.tgz#70366dbf737134761edb017990cf5ce6c6369c40"
+  integrity sha512-HoZr92+ZjFEKar5HS6MC776gYslNOKHt75mEBKWKnPeFDpZ6nH5OeF3S6HFT1mUAUZKrzkez05VboaX8myjSuw==
 
 core-js@^1.0.0:
   version "1.2.7"

From 9b083ecf94afec18cf6662035ecc1f7ea1e2c47a Mon Sep 17 00:00:00 2001
From: Anup Haldar <haldaranup746@gmail.com>
Date: Mon, 2 Oct 2023 22:49:18 -0400
Subject: [PATCH 40/53] format

---
 .../core/assets/src/views/userAccounts/BirthYearSelect.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue b/kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue
index eb1d5adc118..477653ed51e 100644
--- a/kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue
+++ b/kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue
@@ -85,8 +85,8 @@
     methods: {
       makeYearOptions(max, min) {
         return range(max, min, -1).map(n => {
-          // Because of timezone, year could be mismatched when localized in any timezone that less than UTC
-          // for ex- 2022 will be shown instead of 2023
+          // Because of timezone, year could be mismatched when localized in any
+          // timezone that less than UTC. for ex- 2022 will be shown instead of 2023
           let date = new Date();
           date.setFullYear(n);
           return {

From 7f5427e6d126257d0e54a60ed097f32e9af3efd9 Mon Sep 17 00:00:00 2001
From: Anup Haldar <haldaranup746@gmail.com>
Date: Mon, 2 Oct 2023 23:32:57 -0400
Subject: [PATCH 41/53] Linting: let to const for date variable

---
 kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue b/kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue
index 477653ed51e..f6db52e9f3e 100644
--- a/kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue
+++ b/kolibri/core/assets/src/views/userAccounts/BirthYearSelect.vue
@@ -87,7 +87,7 @@
         return range(max, min, -1).map(n => {
           // Because of timezone, year could be mismatched when localized in any
           // timezone that less than UTC. for ex- 2022 will be shown instead of 2023
-          let date = new Date();
+          const date = new Date();
           date.setFullYear(n);
           return {
             label: this.$formatDate(String(date), { year: 'numeric' }),

From b421175dc2799f7ecaefb0e31b68afec25d6b985 Mon Sep 17 00:00:00 2001
From: shivangrawat30 <rawatshivang30@gmail.com>
Date: Tue, 3 Oct 2023 16:34:14 +0530
Subject: [PATCH 42/53] linting errors fixed

Signed-off-by: shivangrawat30 <rawatshivang30@gmail.com>
---
 .../device/assets/src/views/SelectContentPage/index.vue        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
index 09e81abe3d4..7f04134febe 100644
--- a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
@@ -94,7 +94,7 @@
   import { updateTreeViewTopic } from '../../modules/wizard/handlers';
   import { getChannelWithContentSizes } from '../../modules/wizard/apiChannelMetadata';
   import NewChannelVersionBanner from '../ManageContentPage/NewChannelVersionBanner';
-  import { ContentWizardPages, ContentWizardErrors, PageNames } from '../../constants';
+  import { ContentWizardErrors, PageNames } from '../../constants';
   import ChannelContentsSummary from './ChannelContentsSummary';
   import ContentTreeViewer from './ContentTreeViewer';
   import ContentWizardUiAlert from './ContentWizardUiAlert';
@@ -183,6 +183,7 @@
         else if(this.inLocalImportMode) { 
           return availableChannelsPageLink({driveId: this.selectedDrive.id});
         }
+        return availableChannelsPageLink();
       },
       channelId() {
         return this.$route.params.channel_id;

From 2832114015b93b45ab5630fc97dcba727373600d Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Tue, 3 Oct 2023 14:24:34 -0700
Subject: [PATCH 43/53] Pass dummy auth token to testing script.

---
 integration_testing/scripts/run_kolibri_app_mode.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/integration_testing/scripts/run_kolibri_app_mode.py b/integration_testing/scripts/run_kolibri_app_mode.py
index 380118c8961..62efe008d14 100644
--- a/integration_testing/scripts/run_kolibri_app_mode.py
+++ b/integration_testing/scripts/run_kolibri_app_mode.py
@@ -21,10 +21,9 @@ def SERVING(self, port):
         self.port = port
 
     def RUN(self):
-        start_url = (
-            "http://127.0.0.1:{port}".format(port=self.port)
-            + interface.get_initialize_url()
-        )
+        start_url = "http://127.0.0.1:{port}".format(
+            port=self.port
+        ) + interface.get_initialize_url(auth_token="1234")
         print("Kolibri running at: {start_url}".format(start_url=start_url))
 
 

From 9b02095e8e40c1eeafbfe7eb246430f339fab6df Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Tue, 3 Oct 2023 14:35:20 -0700
Subject: [PATCH 44/53] Fix linting.

---
 .../assets/src/views/SelectContentPage/index.vue   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
index 7f04134febe..f6d8e7f3948 100644
--- a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue
@@ -95,12 +95,12 @@
   import { getChannelWithContentSizes } from '../../modules/wizard/apiChannelMetadata';
   import NewChannelVersionBanner from '../ManageContentPage/NewChannelVersionBanner';
   import { ContentWizardErrors, PageNames } from '../../constants';
+  import { availableChannelsPageLink } from '../ManageContentPage/manageContentLinks';
   import ChannelContentsSummary from './ChannelContentsSummary';
   import ContentTreeViewer from './ContentTreeViewer';
   import ContentWizardUiAlert from './ContentWizardUiAlert';
   import { startImportTask } from './api';
   import plugin_data from 'plugin_data';
-  import { availableChannelsPageLink } from '../ManageContentPage/manageContentLinks';
 
   export default {
     name: 'SelectContentPage',
@@ -174,14 +174,12 @@
         return title;
       },
       backRoute() {
-        if(this.inRemoteImportMode){
+        if (this.inRemoteImportMode) {
           return availableChannelsPageLink();
-        }
-        else if(this.inPeerImportMode) {
-          return availableChannelsPageLink({addressId: this.selectedPeer.id})
-        }
-        else if(this.inLocalImportMode) { 
-          return availableChannelsPageLink({driveId: this.selectedDrive.id});
+        } else if (this.inPeerImportMode) {
+          return availableChannelsPageLink({ addressId: this.selectedPeer.id });
+        } else if (this.inLocalImportMode) {
+          return availableChannelsPageLink({ driveId: this.selectedDrive.id });
         }
         return availableChannelsPageLink();
       },

From b536b581175572059a6c320117796516a5c5b456 Mon Sep 17 00:00:00 2001
From: thanksameeelian <ameliabreault@gmail.com>
Date: Fri, 29 Sep 2023 10:53:15 -0500
Subject: [PATCH 45/53] stub out KCircularLoader in failing test

---
 .../learn/assets/test/views/learning-activity-bar.spec.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kolibri/plugins/learn/assets/test/views/learning-activity-bar.spec.js b/kolibri/plugins/learn/assets/test/views/learning-activity-bar.spec.js
index 94c306d1383..fbe8a6fdd45 100644
--- a/kolibri/plugins/learn/assets/test/views/learning-activity-bar.spec.js
+++ b/kolibri/plugins/learn/assets/test/views/learning-activity-bar.spec.js
@@ -5,7 +5,9 @@ import LearningActivityBar from '../../src/views/LearningActivityBar';
 
 jest.mock('kolibri.coreVue.componentSets.sync');
 function makeWrapper({ propsData } = {}) {
-  return mount(LearningActivityBar, { propsData });
+  // stubbing out KCircularLoader, as using the actual component led to errors related to
+  // Vue Composition API - stub may not be needed once we upgrade to Vue 2.7
+  return mount(LearningActivityBar, { propsData, stubs: ['KCircularLoader'] });
 }
 
 describe('LearningActivityBar', () => {
@@ -293,7 +295,7 @@ describe('LearningActivityBar', () => {
 
       it(`doesn't show the downloading loader by default`, () => {
         const wrapper = makeWrapper();
-        expect(wrapper.find("[data-test='downloadingLoader'] svg").exists()).toBeFalsy();
+        expect(wrapper.find("[data-test='downloadingLoader']").vm.shouldShow).toBeFalsy();
       });
 
       it(`shows the downloading loader for truthy 'isDownloading'`, () => {
@@ -302,7 +304,7 @@ describe('LearningActivityBar', () => {
             isDownloading: true,
           },
         });
-        expect(wrapper.find("[data-test='downloadingLoader'] svg").exists()).toBeTruthy();
+        expect(wrapper.find("[data-test='downloadingLoader']").vm.shouldShow).toBeTruthy();
       });
     });
   });

From 1022ed63de566c95bcf6f998773c137fe469917f Mon Sep 17 00:00:00 2001
From: thanksameeelian <ameliabreault@gmail.com>
Date: Tue, 3 Oct 2023 17:08:47 -0500
Subject: [PATCH 46/53] update KDS reference to current HEAD of release-v1.5.x
 branch

---
 kolibri/core/package.json                     | 2 +-
 packages/kolibri-core-for-export/package.json | 4 ++--
 yarn.lock                                     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kolibri/core/package.json b/kolibri/core/package.json
index 3c8a7c8386e..2f0d6fb195b 100644
--- a/kolibri/core/package.json
+++ b/kolibri/core/package.json
@@ -21,7 +21,7 @@
     "js-cookie": "^3.0.5",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.2.0",
-    "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#3ab9801a442b20ddf63248b17ca0d83fe21133fb",
+    "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#ab03c5e257a7806c67cf6250310e3e6ccb5119c9",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.8.1",
diff --git a/packages/kolibri-core-for-export/package.json b/packages/kolibri-core-for-export/package.json
index fefa0a676f4..92c3e01913f 100644
--- a/packages/kolibri-core-for-export/package.json
+++ b/packages/kolibri-core-for-export/package.json
@@ -24,7 +24,7 @@
     "js-cookie": "^3.0.5",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.2.0",
-    "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#3ab9801a442b20ddf63248b17ca0d83fe21133fb",
+    "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#ab03c5e257a7806c67cf6250310e3e6ccb5119c9",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.8.1",
@@ -42,4 +42,4 @@
     "vuex-router-sync": "^5.0.0",
     "xstate": "^4.38.2"
   }
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index 477711d906e..c82e173b125 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7640,9 +7640,9 @@ kolibri-constants@0.2.0:
   resolved "https://registry.yarnpkg.com/kolibri-constants/-/kolibri-constants-0.2.0.tgz#47c9d773894e23251ba5ac4db420822e45603142"
   integrity sha512-WYDMGDzB9gNxRbpX1O2cGe1HrJvLvSZGwMuAv6dqrxJgPf7iO+Hi40/1CXjHM7nk5CRt+hn5bqnMzCBmj1omPA==
 
-"kolibri-design-system@https://github.com/learningequality/kolibri-design-system#3ab9801a442b20ddf63248b17ca0d83fe21133fb":
+"kolibri-design-system@https://github.com/learningequality/kolibri-design-system#ab03c5e257a7806c67cf6250310e3e6ccb5119c9":
   version "1.3.0"
-  resolved "https://github.com/learningequality/kolibri-design-system#3ab9801a442b20ddf63248b17ca0d83fe21133fb"
+  resolved "https://github.com/learningequality/kolibri-design-system#ab03c5e257a7806c67cf6250310e3e6ccb5119c9"
   dependencies:
     aphrodite "https://github.com/learningequality/aphrodite/"
     autosize "^3.0.21"

From 9e1bdc5093d6c8f3143cb78e6ff81ee2aec51eef Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Tue, 3 Oct 2023 15:34:26 -0700
Subject: [PATCH 47/53] Migrates the OSUser associated with a facility user
 when migrating users.

---
 kolibri/plugins/user_profile/tasks.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/kolibri/plugins/user_profile/tasks.py b/kolibri/plugins/user_profile/tasks.py
index ba610ce5a57..ab11fb7c985 100644
--- a/kolibri/plugins/user_profile/tasks.py
+++ b/kolibri/plugins/user_profile/tasks.py
@@ -1,4 +1,5 @@
 import requests
+from django.core.exceptions import RelatedObjectDoesNotExist
 from django.core.management import call_command
 from morango.errors import MorangoError
 from rest_framework import serializers
@@ -157,6 +158,16 @@ def mergeuser(command, **kwargs):
     job.save_meta()
     job.update_progress(1.0, 1.0)
 
+    try:
+        # If the local user is associated with an OSUser
+        # then transfer to the new remote user to maintain
+        # the association
+        os_user = local_user.os_user
+        os_user.user = remote_user
+        os_user.save()
+    except RelatedObjectDoesNotExist:
+        pass
+
     # check if current user should be set as superuser:
     set_as_super_user = kwargs.get("set_as_super_user")
     if set_as_super_user and local_user.is_superuser:

From b11412e774adcc4c4057e4f58704d5598d3b6496 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Wed, 4 Oct 2023 11:50:23 -0700
Subject: [PATCH 48/53] Reference exception properly.

---
 kolibri/plugins/user_profile/tasks.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kolibri/plugins/user_profile/tasks.py b/kolibri/plugins/user_profile/tasks.py
index ab11fb7c985..1ec0efb573f 100644
--- a/kolibri/plugins/user_profile/tasks.py
+++ b/kolibri/plugins/user_profile/tasks.py
@@ -1,5 +1,4 @@
 import requests
-from django.core.exceptions import RelatedObjectDoesNotExist
 from django.core.management import call_command
 from morango.errors import MorangoError
 from rest_framework import serializers
@@ -165,7 +164,7 @@ def mergeuser(command, **kwargs):
         os_user = local_user.os_user
         os_user.user = remote_user
         os_user.save()
-    except RelatedObjectDoesNotExist:
+    except FacilityUser.os_user.RelatedObjectDoesNotExist:
         pass
 
     # check if current user should be set as superuser:

From 1797e14c40e03c0aac4ba635682d9924c107dbf0 Mon Sep 17 00:00:00 2001
From: shivangrawat30 <rawatshivang30@gmail.com>
Date: Thu, 5 Oct 2023 18:47:36 +0530
Subject: [PATCH 49/53] Deleted the responsiveWindowMixin from user_auth

Signed-off-by: shivangrawat30 <rawatshivang30@gmail.com>
---
 .../plugins/user_auth/assets/src/views/SignInPage/index.vue    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kolibri/plugins/user_auth/assets/src/views/SignInPage/index.vue b/kolibri/plugins/user_auth/assets/src/views/SignInPage/index.vue
index 27b81452b4d..0c3d19daf03 100644
--- a/kolibri/plugins/user_auth/assets/src/views/SignInPage/index.vue
+++ b/kolibri/plugins/user_auth/assets/src/views/SignInPage/index.vue
@@ -163,7 +163,6 @@
   import { validateUsername } from 'kolibri.utils.validators';
   import UiAutocompleteSuggestion from 'kolibri-design-system/lib/keen/UiAutocompleteSuggestion';
   import UiAlert from 'kolibri-design-system/lib/keen/UiAlert';
-  import responsiveWindowMixin from 'kolibri.coreVue.mixins.responsiveWindowMixin';
   import { ComponentMap } from '../../constants';
   import getUrlParameter from '../getUrlParameter';
   import AuthBase from '../AuthBase';
@@ -187,7 +186,7 @@
       UiAlert,
       UsersList,
     },
-    mixins: [responsiveWindowMixin, commonCoreStrings, commonUserStrings],
+    mixins: [commonCoreStrings, commonUserStrings],
     data() {
       return {
         username: '',

From bfc0430d6d4ec09e626690622d9b3e530ce323cd Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Tue, 3 Oct 2023 12:05:12 -0700
Subject: [PATCH 50/53] Add regression tests to ecosystem tests to ensure that
 recreated objects persist and that deletes are preferred to updates.

---
 .../auth/test/test_morango_integration.py     | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/kolibri/core/auth/test/test_morango_integration.py b/kolibri/core/auth/test/test_morango_integration.py
index 438d79c96e8..bd11d209758 100644
--- a/kolibri/core/auth/test/test_morango_integration.py
+++ b/kolibri/core/auth/test/test_morango_integration.py
@@ -383,6 +383,7 @@ def test_scenarios(self, servers):
         s1.create_model(Role, collection_id=fac.id, user_id=alk_user.id, kind="admin")
         s0.create_model(Role, collection_id=fac.id, user_id=alk_user.id, kind="admin")
         s1.sync(s0, facility)
+        s2.sync(s0, facility)
         role = Role.objects.using(s1.db_alias).get(user=alk_user)
         admin_role = Store.objects.using(s1.db_alias).get(id=role.id)
         self.assertTrue(admin_role.conflicting_serialized_data)
@@ -397,6 +398,41 @@ def test_scenarios(self, servers):
         )
         self.assertTrue(Store.objects.using(s1.db_alias).get(id=alk_user.id).deleted)
 
+        # assert deleted object is transitively propagated
+        s2.sync(s1, facility)
+        self.assertFalse(
+            FacilityUser.objects.using(s2.db_alias)
+            .filter(username="Antemblowind")
+            .exists()
+        )
+        self.assertTrue(Store.objects.using(s2.db_alias).get(id=alk_user.id).deleted)
+
+        # assert deletion takes priority over update
+        alk_user = FacilityUser.objects.using(s0.db_alias).create(
+            username="Antemblowind", facility=facility
+        )
+        # Sync to both devices
+        s1.sync(s0, facility)
+        s2.sync(s0, facility)
+
+        # delete on s0
+        s0.delete_model(FacilityUser, id=alk_user.id)
+        # update on s1
+        s1.update_model(FacilityUser, alk_user.id, username="Antemblowind2")
+        # Sync deletion to s2
+        s2.sync(s0, facility)
+        self.assertFalse(
+            FacilityUser.objects.using(s2.db_alias).filter(id=alk_user.id).exists()
+        )
+        # Sync update to s2
+        s2.sync(s1, facility)
+        self.assertFalse(
+            FacilityUser.objects.using(s2.db_alias).filter(id=alk_user.id).exists()
+        )
+        self.assertFalse(
+            FacilityUser.objects.using(s1.db_alias).filter(id=alk_user.id).exists()
+        )
+
         # # role deletion and re-creation
         # Change roles for users
         alto_user = FacilityUser.objects.using(s1.db_alias).get(
@@ -847,6 +883,22 @@ def test_single_user_assignment_sync(self, servers):
                 self.assert_existence(
                     self.tablet, kind, assignment_id, should_exist=False
                 )
+                if disable_assignment == self.deactivate:
+                    # If we're deactivating the assignment, try reactivating it to check that we
+                    # can make it active again
+                    self.set_active_state(self.laptop_a, kind, assignment_id, True)
+                    self.sync_full_facility_servers()
+                    self.assert_existence(
+                        self.tablet, kind, assignment_id, should_exist=False
+                    )
+                    self.assert_existence(
+                        self.laptop_b, kind, assignment_id, should_exist=True
+                    )
+                    self.sync_single_user(self.laptop_a)
+                    # import IPython; IPython.embed()
+                    self.assert_existence(
+                        self.tablet, kind, assignment_id, should_exist=True
+                    )
 
         # Create exam on Laptop A, single-user sync to tablet, then modify exam on Laptop A and
         # single-user sync again to check that "updating" works

From 0bfe2ddfa0f917e1c52c11238af50368b7506575 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Thu, 5 Oct 2023 14:36:52 -0700
Subject: [PATCH 51/53] Upgrade morango to 0.6.18.

---
 requirements/base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/base.txt b/requirements/base.txt
index f637f9784e2..834db4ad6a0 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -16,7 +16,7 @@ more-itertools==5.0.0  # Last Python 2.7 friendly release # pyup: <6.0
 le-utils==0.2.1
 jsonfield==2.0.2
 requests-toolbelt==0.9.1
-morango==0.6.16
+morango==0.6.18
 tzlocal==2.1
 pytz==2022.1
 python-dateutil==2.8.2

From c509e0e1f9d5c126d8c3a1dd74d9e61304f48390 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Oct 2023 00:12:55 +0000
Subject: [PATCH 52/53] Bump csv-parse from 5.5.0 to 5.5.1

Bumps [csv-parse](https://github.com/adaltas/node-csv/tree/HEAD/packages/csv-parse) from 5.5.0 to 5.5.1.
- [Changelog](https://github.com/adaltas/node-csv/blob/master/packages/csv-parse/CHANGELOG.md)
- [Commits](https://github.com/adaltas/node-csv/commits/csv-parse@5.5.1/packages/csv-parse)

---
updated-dependencies:
- dependency-name: csv-parse
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/kolibri-tools/package.json | 2 +-
 yarn.lock                           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/kolibri-tools/package.json b/packages/kolibri-tools/package.json
index 1c65ed13e2d..0e749286417 100644
--- a/packages/kolibri-tools/package.json
+++ b/packages/kolibri-tools/package.json
@@ -34,7 +34,7 @@
     "core-js": "^3",
     "css-loader": "6.8.1",
     "css-minimizer-webpack-plugin": "5.0.1",
-    "csv-parse": "^5.5.0",
+    "csv-parse": "^5.5.1",
     "csv-writer": "^1.3.0",
     "del": "^6.1.1",
     "escodegen": "^2.1.0",
diff --git a/yarn.lock b/yarn.lock
index c82e173b125..0dc0fdb93e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4284,10 +4284,10 @@ csv-generator-client@^2.1.1:
     babel-polyfill "^6.26.0"
     lodash "^4.17.4"
 
-csv-parse@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.5.0.tgz#2313421e69b650dae32a79ac884b20b21ca1d9da"
-  integrity sha512-RxruSK3M4XgzcD7Trm2wEN+SJ26ChIb903+IWxNOcB5q4jT2Cs+hFr6QP39J05EohshRFEvyzEBoZ/466S2sbw==
+csv-parse@^5.5.1:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.5.1.tgz#ed08dc538c1b009c77428087470356830e6bbb41"
+  integrity sha512-A6DrzSnN7MuOjXOT2tbO08YyYnP9sNDn8zITMHbZN/qt3gUzdGcu3LacYKY7b3RHwKoPwkhhmLeP7SE30cRmgg==
 
 csv-writer@^1.3.0:
   version "1.6.0"

From f7442ef07c409977885c9a72bb910af1688e35f4 Mon Sep 17 00:00:00 2001
From: Philip Withnall <pwithnall@endlessos.org>
Date: Fri, 22 Sep 2023 18:43:12 +0100
Subject: [PATCH 53/53] kolibri-tools: Accept multiple --namespace/--searchPath
 arguments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is needed when a plugin has more than one sub-package which
contains translatable strings. All the strings from all the packages
need to be pulled into the `*-messages.json` file which is injected into
the frontend output — but currently only at most one sub-package is
supported. For Kolibri itself, this is kolibri-common. The
kolibri-explore-plugin, however, has at least two sub-packages.

This commit changes the `--namespace` and `--searchPath` options to
allow them to be specified multiple times. For example, `--namespace
ek-components --searchPath ./packages/ek-components --namespace
template-ui --searchPath ./packages/template-ui`. It shouldn’t change
the behaviour when they are passed zero or one times, as before, so this
change should be backwards-compatible.

The strings from each namespace are still outputted into a per-namespace
CSV file, with the assumption that the translation step (when CSVs are
turned into JSON files) will combine them all into a single JSON file
suitable for webpack to load.

See https://github.com/endlessm/kolibri-explore-plugin/issues/846

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
---
 packages/kolibri-tools/lib/cli.js | 33 +++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/packages/kolibri-tools/lib/cli.js b/packages/kolibri-tools/lib/cli.js
index f0509710149..2c336694d8f 100755
--- a/packages/kolibri-tools/lib/cli.js
+++ b/packages/kolibri-tools/lib/cli.js
@@ -513,7 +513,7 @@ function _generatePathInfo({
       })
     );
   }
-  if (namespace && searchPath) {
+  if (namespace.length && namespace.length == searchPath.length) {
     let aliases;
     if (webpackConfig) {
       const webpack = require('webpack');
@@ -528,19 +528,25 @@ function _generatePathInfo({
       }
       aliases = buildConfig.resolve.alias;
     }
-    pathInfoArray.push({
-      moduleFilePath: searchPath,
-      namespace: namespace,
-      name: namespace,
-      aliases,
-    });
+    for (let i = 0; i < namespace.length; i++) {
+      pathInfoArray.push({
+        moduleFilePath: searchPath[i],
+        namespace: namespace[i],
+        name: namespace[i],
+        aliases,
+      });
+    }
   }
   if (pathInfoArray.length) {
     return pathInfoArray;
   }
   cliLogging.error('This command requires one or more of the following combinations of arguments:');
   cliLogging.error('1) The --pluginFile, --plugins, or --pluginPath argument.');
-  cliLogging.error('2) The --searchPath argument along with the --namespace argument.');
+  cliLogging.error('2) One or more pairs of the --searchPath and --namespace arguments.');
+}
+
+function _collect(value, previous) {
+  return previous.concat([value]);
 }
 
 function _addPathOptions(cmd) {
@@ -564,7 +570,12 @@ function _addPathOptions(cmd) {
       list,
       langIgnoreDefaults.length ? langIgnoreDefaults : ignoreDefaults
     )
-    .option('-n , --namespace <namespace>', 'Set namespace for string extraction')
+    .option(
+      '-n , --namespace <namespace>',
+      'Set namespace for string extraction; this may be specified multiple times, but there must be an equal number of --searchPath arguments',
+      _collect,
+      []
+    )
     .option(
       '--localeDataFolder <localeDataFolder>',
       'Set path to write locale files to',
@@ -573,7 +584,9 @@ function _addPathOptions(cmd) {
     )
     .option(
       '--searchPath <searchPath>',
-      'Set path to search for files containing strings to be extracted'
+      'Set path to search for files containing strings to be extracted; this may be specified multiple times, but there must be an equal number of --namespace arguments',
+      _collect,
+      []
     )
     .option(
       '--webpackConfig <webpackConfig>',