From a2a445e6a2ddfe3b787a556c52943ad18f365c53 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Fri, 9 Jun 2023 15:19:45 -0700
Subject: [PATCH 01/63] Switch unsynced change monitoring to a liveQuery to
 further remove Dexie Observable.

---
 .../contentcuration/frontend/shared/app.js    |  3 +++
 .../shared/vuex/syncProgressPlugin/index.js   | 27 +++++++++++--------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/shared/app.js b/contentcuration/contentcuration/frontend/shared/app.js
index 071e0c0813..f93353ba74 100644
--- a/contentcuration/contentcuration/frontend/shared/app.js
+++ b/contentcuration/contentcuration/frontend/shared/app.js
@@ -350,5 +350,8 @@ export default async function startApp({ store, router, index }) {
   // to the session state.
   injectVuexStore(store);
 
+  // Start listening for unsynced change events in IndexedDB
+  store.listenForIndexedDBChanges();
+
   rootVue = new Vue(config);
 }
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/syncProgressPlugin/index.js b/contentcuration/contentcuration/frontend/shared/vuex/syncProgressPlugin/index.js
index 60a2324d2e..07811b8666 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/syncProgressPlugin/index.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/syncProgressPlugin/index.js
@@ -1,3 +1,4 @@
+import { liveQuery } from 'dexie';
 import syncProgressModule from './syncProgressModule';
 import db from 'shared/data/db';
 import { CHANGES_TABLE } from 'shared/data/constants';
@@ -5,18 +6,22 @@ import { CHANGES_TABLE } from 'shared/data/constants';
 const SyncProgressPlugin = store => {
   store.registerModule('syncProgress', syncProgressModule);
 
-  db.on('changes', function(changes) {
-    const changesTableUpdated = changes.some(change => change.table === CHANGES_TABLE);
-    if (!changesTableUpdated) {
-      return;
-    }
+  store.listenForIndexedDBChanges = () => {
+    const observable = liveQuery(() => {
+      return db[CHANGES_TABLE].toCollection()
+        .filter(c => !c.synced)
+        .first(Boolean);
+    });
 
-    db[CHANGES_TABLE].toCollection()
-      .filter(c => !c.synced)
-      .limit(1)
-      .count()
-      .then(count => store.commit('SET_UNSAVED_CHANGES', count > 0));
-  });
+    const subscription = observable.subscribe({
+      next(result) {
+        store.commit('SET_UNSAVED_CHANGES', result);
+      },
+      error() {
+        subscription.unsubscribe();
+      },
+    });
+  };
 };
 
 export default SyncProgressPlugin;

From 6960803b93953ca8d1b3319f13a38387261cd367 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Fri, 9 Jun 2023 15:29:41 -0700
Subject: [PATCH 02/63] Remove resource based listeners in favour of liveQuery.

---
 .../contentcuration/frontend/shared/app.js     | 18 ++++++++++++++++++
 .../frontend/shared/data/index.js              |  8 --------
 .../frontend/shared/data/resources.js          | 11 -----------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/shared/app.js b/contentcuration/contentcuration/frontend/shared/app.js
index f93353ba74..582044ff67 100644
--- a/contentcuration/contentcuration/frontend/shared/app.js
+++ b/contentcuration/contentcuration/frontend/shared/app.js
@@ -1,4 +1,5 @@
 import 'regenerator-runtime/runtime';
+import { liveQuery } from 'dexie';
 import * as Sentry from '@sentry/vue';
 import Vue from 'vue';
 import VueRouter from 'vue-router';
@@ -115,6 +116,7 @@ import { i18nSetup } from 'shared/i18n';
 import './styles/vuetify.css';
 import 'shared/styles/main.less';
 import Base from 'shared/Base.vue';
+import urls from 'shared/urls';
 import ActionLink from 'shared/views/ActionLink';
 import Menu from 'shared/views/Menu';
 import { initializeDB, resetDB } from 'shared/data';
@@ -316,7 +318,23 @@ export default async function startApp({ store, router, index }) {
     await resetDB();
   }
   if (currentUser.id !== undefined && currentUser.id !== null) {
+    // The user is logged on, so persist that to the session table in indexeddb
     await store.dispatch('saveSession', currentUser, { root: true });
+    // Also watch in case the user logs out, then we should redirect to the login page
+    const observable = liveQuery(() => {
+      return Session.table.toCollection().first(Boolean);
+    });
+
+    const subscription = observable.subscribe({
+      next(result) {
+        if (!result && !window.location.pathname.endsWith(urls.accounts())) {
+          window.location = urls.accounts();
+        }
+      },
+      error() {
+        subscription.unsubscribe();
+      },
+    });
   }
 
   await Session.setChannelScope();
diff --git a/contentcuration/contentcuration/frontend/shared/data/index.js b/contentcuration/contentcuration/frontend/shared/data/index.js
index 380e09f9c1..1baed3d8d5 100644
--- a/contentcuration/contentcuration/frontend/shared/data/index.js
+++ b/contentcuration/contentcuration/frontend/shared/data/index.js
@@ -37,18 +37,10 @@ if (process.env.NODE_ENV !== 'production' && typeof window !== 'undefined') {
   window.resetDB = resetDB;
 }
 
-function applyResourceListener(change) {
-  const resource = INDEXEDDB_RESOURCES[change.table];
-  if (resource && resource.listeners && resource.listeners[change.type]) {
-    resource.listeners[change.type](change);
-  }
-}
-
 export async function initializeDB() {
   try {
     setupSchema();
     await db.open();
-    db.on('changes', changes => changes.map(applyResourceListener));
     document.addEventListener('visibilitychange', () => {
       if (document.hidden) {
         stopSyncing();
diff --git a/contentcuration/contentcuration/frontend/shared/data/resources.js b/contentcuration/contentcuration/frontend/shared/data/resources.js
index 3843753b6b..008883fa18 100644
--- a/contentcuration/contentcuration/frontend/shared/data/resources.js
+++ b/contentcuration/contentcuration/frontend/shared/data/resources.js
@@ -214,7 +214,6 @@ class IndexedDBResource {
     uuid = true,
     indexFields = [],
     syncable = false,
-    listeners = {},
     ...options
   } = {}) {
     this.tableName = tableName;
@@ -228,9 +227,6 @@ class IndexedDBResource {
     copyProperties(this, options);
     // By default these resources do not sync changes to the backend.
     this.syncable = syncable;
-    // An object for listening to specific change events on this resource in order to
-    // allow for side effects from changes - should be a map of change type to handler function.
-    this.listeners = listeners;
   }
 
   get table() {
@@ -977,13 +973,6 @@ export const Session = new IndexedDBResource({
   tableName: TABLE_NAMES.SESSION,
   idField: CURRENT_USER,
   uuid: false,
-  listeners: {
-    [CHANGE_TYPES.DELETED]: function() {
-      if (!window.location.pathname.endsWith(urls.accounts())) {
-        window.location = urls.accounts();
-      }
-    },
-  },
   get currentChannel() {
     return window.CHANNEL_EDIT_GLOBAL || {};
   },

From d9388937937e39e6b06ee12d7b73ae1ab3e657fd Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Fri, 9 Jun 2023 15:47:52 -0700
Subject: [PATCH 03/63] Adds a basic global saving indicator to the channel
 edit page.

---
 .../components/edit/SavingIndicator.vue       | 43 ++++++++++++-------
 .../views/TreeView/TreeViewBase.vue           |  3 ++
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/SavingIndicator.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/SavingIndicator.vue
index 682a58d6c7..09a43210b0 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/SavingIndicator.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/SavingIndicator.vue
@@ -27,12 +27,12 @@
     props: {
       nodeIds: {
         type: Array,
-        default: () => [],
+        default: null,
       },
     },
     data() {
       return {
-        hasChanges: false,
+        hasNodeChanges: false,
         isSaving: false,
         lastSaved: null,
         lastSavedText: '',
@@ -43,6 +43,13 @@
     computed: {
       ...mapGetters('file', ['getContentNodeFiles']),
       ...mapGetters('assessmentItem', ['getAssessmentItems']),
+      ...mapGetters(['areAllChangesSaved']),
+      hasChanges() {
+        if (this.nodeIds) {
+          return this.hasNodeChanges;
+        }
+        return !this.areAllChangesSaved;
+      },
     },
     watch: {
       hasChanges(hasChanges) {
@@ -62,21 +69,27 @@
       },
     },
     mounted() {
-      this.interval = setInterval(() => {
-        const files = flatten(this.nodeIds.map(this.getContentNodeFiles));
-        const assessmentItems = flatten(this.nodeIds.map(this.getAssessmentItems));
-        this.checkSavingProgress({
-          contentNodeIds: this.nodeIds,
-          fileIds: files.map(f => f.id).filter(Boolean),
-          assessmentIds: assessmentItems
-            .map(ai => [ai.contentnode, ai.assessment_id])
-            .filter(Boolean),
-        }).then(hasChanges => (this.hasChanges = hasChanges));
-      }, CHECK_SAVE_INTERVAL);
+      if (this.nodeIds) {
+        this.interval = setInterval(() => {
+          const files = flatten(this.nodeIds.map(this.getContentNodeFiles));
+          const assessmentItems = flatten(this.nodeIds.map(this.getAssessmentItems));
+          this.checkSavingProgress({
+            contentNodeIds: this.nodeIds,
+            fileIds: files.map(f => f.id).filter(Boolean),
+            assessmentIds: assessmentItems
+              .map(ai => [ai.contentnode, ai.assessment_id])
+              .filter(Boolean),
+          }).then(hasChanges => (this.hasNodeChanges = hasChanges));
+        }, CHECK_SAVE_INTERVAL);
+      }
     },
     beforeDestroy() {
-      clearInterval(this.interval);
-      clearInterval(this.updateLastSavedInterval);
+      if (this.interval) {
+        clearInterval(this.interval);
+      }
+      if (this.updateLastSavedInterval) {
+        clearInterval(this.updateLastSavedInterval);
+      }
     },
     methods: {
       ...mapActions('contentNode', ['checkSavingProgress']),
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
index 222cb73ebc..d9e49ca59b 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
@@ -55,6 +55,7 @@
         </router-link>
       </VToolbarItems>
       <VSpacer />
+      <SavingIndicator />
       <OfflineText indicator />
       <ProgressModal />
       <div
@@ -310,6 +311,7 @@
   import SyncResourcesModal from '../sync/SyncResourcesModal';
   import ProgressModal from '../progress/ProgressModal';
   import PublishModal from '../../components/publish/PublishModal';
+  import SavingIndicator from '../../components/edit/SavingIndicator';
   import { DraggableRegions, DraggableUniverses, RouteNames } from '../../constants';
   import MainNavigationDrawer from 'shared/views/MainNavigationDrawer';
   import IconButton from 'shared/views/IconButton';
@@ -340,6 +342,7 @@
       ContentNodeIcon,
       DraggablePlaceholder,
       MessageDialog,
+      SavingIndicator,
     },
     mixins: [titleMixin],
     props: {

From 91e8a5c709e01ef56788e7dcffa389a3214a2fa7 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Tue, 13 Jun 2023 11:27:39 -0700
Subject: [PATCH 04/63] Handle side-loading node data separate APIs

---
 .../views/ImportFromChannels/BrowsingCard.vue |   2 +-
 .../ImportFromChannelsModal.vue               |   6 +-
 .../channelEdit/vuex/contentNode/actions.js   |  21 +-
 .../channelEdit/vuex/contentNode/utils.js     |   5 +-
 .../vuex/importFromChannels/actions.js        |  47 ++++-
 .../__tests__/ContentNodeResource.spec.js     |  40 +++-
 .../shared/data/applyRemoteChanges.js         |   4 +-
 .../frontend/shared/data/public.js            | 190 ++++++++++++++++++
 .../frontend/shared/data/resources.js         |  34 +++-
 .../shared/views/form/DropdownWrapper.vue     |   6 +-
 .../search/viewsets/contentnode.py            |  32 +--
 11 files changed, 341 insertions(+), 46 deletions(-)
 create mode 100644 contentcuration/contentcuration/frontend/shared/data/public.js

diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue
index a8a92087cd..9a9621f8f5 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/BrowsingCard.vue
@@ -149,7 +149,7 @@
         if (this.isTopic) {
           return `${baseUrl}#/${this.node.id}`;
         }
-        return `${baseUrl}#/${this.node.parent_id}/${this.node.id}`;
+        return `${baseUrl}#/${this.node.parent}/${this.node.id}`;
       },
       resourcesMsg() {
         let count;
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue
index e3e394602d..60423ee33b 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue
@@ -74,7 +74,7 @@
 
 <script>
 
-  import { mapActions, mapMutations, mapState } from 'vuex';
+  import { mapActions, mapMutations, mapState, mapGetters } from 'vuex';
   import sumBy from 'lodash/sumBy';
   import { RouteNames } from '../../constants';
   import ResourceDrawer from '../../components/ResourceDrawer';
@@ -114,6 +114,7 @@
     },
     computed: {
       ...mapState('importFromChannels', ['selected']),
+      ...mapGetters('contentNode', ['getContentNode']),
       dialog: {
         get() {
           return IMPORT_ROUTES.includes(this.$route.name);
@@ -210,9 +211,12 @@
       },
       handleClickImport() {
         const nodeIds = this.selected.map(({ id }) => id);
+        // Grab the source nodes from Vuex, since search should have loaded them into it
+        const sourceNodes = nodeIds.map(id => this.getContentNode(id));
         return this.copyContentNodes({
           id__in: nodeIds,
           target: this.$route.params.destNodeId,
+          sourceNodes,
         }).then(() => {
           // When exiting, do not show snackbar when clearing selections
           this.showSnackbar = false;
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
index d0c3f2bba1..8177d2b53b 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
@@ -391,11 +391,18 @@ export function deleteContentNodes(context, contentNodeIds) {
 
 export function copyContentNode(
   context,
-  { id, target, position = RELATIVE_TREE_POSITIONS.LAST_CHILD, excluded_descendants = null } = {}
+  {
+    id,
+    target,
+    position = RELATIVE_TREE_POSITIONS.LAST_CHILD,
+    excluded_descendants = null,
+    sourceNode = null,
+  } = {}
 ) {
   // First, this will parse the tree and create the copy the local tree nodes,
   // with a `source_id` of the source node then create the content node copies
-  return ContentNode.copy(id, target, position, excluded_descendants).then(node => {
+  console.log('copyContentNode', id, target, position, excluded_descendants, { ...sourceNode });
+  return ContentNode.copy(id, target, position, excluded_descendants, sourceNode).then(node => {
     context.commit('ADD_CONTENTNODE', node);
     return node;
   });
@@ -403,10 +410,16 @@ export function copyContentNode(
 
 export function copyContentNodes(
   context,
-  { id__in, target, position = RELATIVE_TREE_POSITIONS.LAST_CHILD }
+  { id__in, target, position = RELATIVE_TREE_POSITIONS.LAST_CHILD, sourceNodes = null }
 ) {
   return Promise.all(
-    id__in.map(id => context.dispatch('copyContentNode', { id, target, position }))
+    id__in.map(id => {
+      let sourceNode = null;
+      if (sourceNodes) {
+        sourceNode = sourceNodes.find(n => n.id === id);
+      }
+      return context.dispatch('copyContentNode', { id, target, position, sourceNode });
+    })
   );
 }
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/utils.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/utils.js
index f7642556b0..634e17b75a 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/utils.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/utils.js
@@ -1,9 +1,12 @@
+import isString from 'lodash/isString';
 import find from 'lodash/find';
 import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 import { RolesNames } from 'shared/leUtils/Roles';
 
 export function parseNode(node, children) {
-  const thumbnail_encoding = JSON.parse(node.thumbnail_encoding || '{}');
+  const thumbnail_encoding = isString(node.thumbnail_encoding)
+    ? JSON.parse(node.thumbnail_encoding || '{}')
+    : node.thumbnail_encoding || {};
   const tags = Object.keys(node.tags || {});
   const aggregateValues = {};
   if (node.kind === ContentKindsNames.TOPIC) {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js
index 5f2bc585e3..3cb9a1d0b3 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js
@@ -1,17 +1,54 @@
+import partition from 'lodash/partition';
 import client from 'shared/client';
+import urls from 'shared/urls';
+import * as publicApi from 'shared/data/public';
 import { NOVALUE, ChannelListTypes } from 'shared/constants';
 
 import { Channel, SavedSearch } from 'shared/data/resources';
 
-export function fetchResourceSearchResults(context, params) {
+export async function fetchResourceSearchResults(context, params) {
   params = { ...params };
   delete params['last'];
   params.page_size = params.page_size || 25;
   params.channel_list = params.channel_list || ChannelListTypes.PUBLIC;
-  return client.get(window.Urls.search_list(), { params }).then(response => {
-    context.commit('contentNode/ADD_CONTENTNODES', response.data.results, { root: true });
-    return response.data;
-  });
+
+  const response = await client.get(urls.search_list(), { params });
+
+  // Split nodes into public and private so we can call the separate apis
+  const [publicNodes, privateNodes] = partition(response.data.results, node => node.public);
+
+  const privatePromise = privateNodes.length
+    ? context.dispatch(
+        'contentNode/loadContentNodes',
+        {
+          id__in: privateNodes.map(node => node.id),
+        },
+        { root: true }
+      )
+    : Promise.resolve([]);
+
+  await Promise.all([
+    // the loadContentNodes action already loads the nodes into vuex
+    privatePromise,
+    Promise.all(
+      // The public API is cached, so we can hopefully call it multiple times without
+      // worrying too much about performance
+      publicNodes.map(async node => {
+        const publicNode = await publicApi.getContentNode(node.node_id).catch(() => null);
+        if (!publicNode) {
+          return;
+        }
+        return publicApi.convertContentNodeResponse(node.id, node.root_id, publicNode);
+      })
+    )
+      .then(nodes => nodes.filter(Boolean))
+      .then(nodes => {
+        context.commit('contentNode/ADD_CONTENTNODES', nodes, { root: true });
+        return nodes;
+      }),
+  ]);
+
+  return response.data;
 }
 
 export function loadChannels(context, params) {
diff --git a/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js b/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js
index eaa3249413..a7f58f81c2 100644
--- a/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js
@@ -298,7 +298,10 @@ describe('ContentNode methods', () => {
     it('should reject with error when attempting to set as child of itself', async () => {
       parent.id = 'abc123';
       await expect(
-        ContentNode.resolveTreeInsert('abc123', 'target', 'position', false, jest.fn())
+        ContentNode.resolveTreeInsert(
+          { id: 'abc123', target: 'target', position: 'position', isCreate: false },
+          jest.fn()
+        )
       ).rejects.toThrow('Cannot set node as child of itself');
       expect(resolveParent).toHaveBeenCalledWith('target', 'position');
     });
@@ -307,7 +310,10 @@ describe('ContentNode methods', () => {
       it('should default to appending', async () => {
         const cb = jest.fn(() => Promise.resolve('results'));
         await expect(
-          ContentNode.resolveTreeInsert('abc123', 'target', 'position', false, cb)
+          ContentNode.resolveTreeInsert(
+            { id: 'abc123', target: 'target', position: 'position', isCreate: false },
+            cb
+          )
         ).resolves.toEqual('results');
         expect(resolveParent).toHaveBeenCalledWith('target', 'position');
         expect(treeLock).toHaveBeenCalledWith(parent.root_id, expect.any(Function));
@@ -340,7 +346,10 @@ describe('ContentNode methods', () => {
         const cb = jest.fn(() => Promise.resolve('results'));
         parent.channel_id = null;
         await expect(
-          ContentNode.resolveTreeInsert('abc123', 'target', 'position', false, cb)
+          ContentNode.resolveTreeInsert(
+            { id: 'abc123', target: 'target', position: 'position', isCreate: false },
+            cb
+          )
         ).resolves.toEqual('results');
         expect(resolveParent).toHaveBeenCalledWith('target', 'position');
         expect(treeLock).toHaveBeenCalledWith(parent.root_id, expect.any(Function));
@@ -377,7 +386,10 @@ describe('ContentNode methods', () => {
           .map((_, i) => ({ id: uuid4(), lft: i, title: `Sibling ${i}` }));
 
         await expect(
-          ContentNode.resolveTreeInsert('abc123', 'target', 'position', false, cb)
+          ContentNode.resolveTreeInsert(
+            { id: 'abc123', target: 'target', position: 'position', isCreate: false },
+            cb
+          )
         ).resolves.toEqual('results');
         expect(resolveParent).toHaveBeenCalledWith('target', 'position');
         expect(treeLock).toHaveBeenCalledWith(parent.root_id, expect.any(Function));
@@ -413,7 +425,10 @@ describe('ContentNode methods', () => {
           .fill(1)
           .map((_, i) => ({ id: uuid4(), title: `Sibling ${i}` }));
         await expect(
-          ContentNode.resolveTreeInsert('abc123', 'target', 'position', false, cb)
+          ContentNode.resolveTreeInsert(
+            { id: 'abc123', target: 'target', position: 'position', isCreate: false },
+            cb
+          )
         ).rejects.toThrow('New lft value evaluated to null');
         expect(resolveParent).toHaveBeenCalledWith('target', 'position');
         expect(treeLock).toHaveBeenCalledWith(parent.root_id, expect.any(Function));
@@ -428,7 +443,10 @@ describe('ContentNode methods', () => {
       it('should default to appending', async () => {
         const cb = jest.fn(() => Promise.resolve('results'));
         await expect(
-          ContentNode.resolveTreeInsert('abc123', 'target', 'position', true, cb)
+          ContentNode.resolveTreeInsert(
+            { id: 'abc123', target: 'target', position: 'position', isCreate: true },
+            cb
+          )
         ).resolves.toEqual('results');
         expect(resolveParent).toHaveBeenCalledWith('target', 'position');
         expect(treeLock).toHaveBeenCalledWith(parent.root_id, expect.any(Function));
@@ -465,7 +483,10 @@ describe('ContentNode methods', () => {
           .fill(1)
           .map((_, i) => ({ id: uuid4(), title: `Sibling ${i}` }));
         await expect(
-          ContentNode.resolveTreeInsert('abc123', 'target', 'position', true, cb)
+          ContentNode.resolveTreeInsert(
+            { id: 'abc123', target: 'target', position: 'position', isCreate: true },
+            cb
+          )
         ).resolves.toEqual('results');
         expect(resolveParent).toHaveBeenCalledWith('target', 'position');
         expect(treeLock).toHaveBeenCalledWith(parent.root_id, expect.any(Function));
@@ -502,7 +523,10 @@ describe('ContentNode methods', () => {
           .fill(1)
           .map((_, i) => ({ id: uuid4(), title: `Sibling ${i}` }));
         await expect(
-          ContentNode.resolveTreeInsert('abc123', 'target', 'position', true, cb)
+          ContentNode.resolveTreeInsert(
+            { id: 'abc123', target: 'target', position: 'position', isCreate: true },
+            cb
+          )
         ).rejects.toThrow('New lft value evaluated to null');
         expect(resolveParent).toHaveBeenCalledWith('target', 'position');
         expect(treeLock).toHaveBeenCalledWith(parent.root_id, expect.any(Function));
diff --git a/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js b/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js
index 02b34ca9af..ea10bc6768 100644
--- a/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js
+++ b/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js
@@ -82,7 +82,7 @@ function applyMove(change) {
   }
 
   const { key, target, position } = change;
-  return resource.resolveTreeInsert(key, target, position, false, data => {
+  return resource.resolveTreeInsert({ id: key, target, position, isCreate: false }, data => {
     return transaction(change, () => {
       return resource.tableMove(data);
     });
@@ -97,7 +97,7 @@ function applyCopy(change) {
 
   const { key, target, position, from_key } = change;
   // copying takes the ID of the node to copy, so we use `from_key`
-  return resource.resolveTreeInsert(from_key, target, position, true, data => {
+  return resource.resolveTreeInsert({ id: from_key, target, position, isCreate: true }, data => {
     return transaction(change, () => {
       // Update the ID on the payload to match the received change, since isCreate=true
       // would generate new IDs
diff --git a/contentcuration/contentcuration/frontend/shared/data/public.js b/contentcuration/contentcuration/frontend/shared/data/public.js
new file mode 100644
index 0000000000..644fb138a8
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/data/public.js
@@ -0,0 +1,190 @@
+/**
+ * Utilities related to Kolibri Public API
+ *
+ * We don't need to put requests to these APIs behind Vuex or IndexedDB caching because the APIs are
+ * already cached by cloudflare and by extension, the browser too.
+ * Let the browser do the caching for us.
+ *
+ * See bottom of file for '@typedef's
+ */
+import isFunction from 'lodash/isFunction';
+import { RolesNames } from 'shared/leUtils/Roles';
+import { findLicense } from 'shared/utils/helpers';
+import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
+import client from 'shared/client';
+import urls from 'shared/urls';
+
+/**
+ * Assumes obj[key] is an array of strings
+ * @param {string} key
+ * @param {object} obj
+ * @return {object}
+ * @private
+ */
+function _convertMetadataLabel(key, obj) {
+  const converted = {};
+  for (const labelKey of obj[key]) {
+    converted[labelKey] = true;
+  }
+  return converted;
+}
+
+const CONTENT_NODE_FIELD_MAP = {
+  // `destination field`: `source field` or value producing function
+  node_id: 'id',
+  content_id: 'content_id',
+  channel_id: 'channel_id',
+  parent: 'parent',
+  title: 'title',
+  description: 'description',
+  kind: 'kind',
+  author: 'author',
+  provider: 'provider',
+  aggregator: 'aggregator',
+  suggested_duration: 'duration',
+  lft: 'lft',
+  changed: () => false,
+  published: () => true,
+  complete: () => true,
+  has_updated_descendants: () => false,
+  has_new_descendants: () => false,
+  learning_activities: _convertMetadataLabel.bind({}, 'learning_activities'),
+  grade_levels: _convertMetadataLabel.bind({}, 'grade_levels'),
+  accessibility_labels: _convertMetadataLabel.bind({}, 'accessibility_labels'),
+  categories: _convertMetadataLabel.bind({}, 'categories'),
+  resource_types: _convertMetadataLabel.bind({}, 'resource_types'),
+  tags: _convertMetadataLabel.bind({}, 'tags'),
+  extra_fields: obj => ({ options: JSON.parse(obj['options']) }),
+  role_visibility: obj => (obj['coach_content'] ? RolesNames.COACH : RolesNames.LEARNER),
+  license: obj => findLicense(obj['license_name']),
+  license_description: 'license_description',
+  copyright_holder: 'license_owner',
+  coach_count: 'num_coach_contents',
+  // see MPTTModel for explanation of this calculation
+  total_count: obj =>
+    obj['kind'] === ContentKindsNames.TOPIC ? (obj['rght'] - obj['lft'] - 1) / 2 : 1,
+  language: obj => obj['lang']['id'],
+  thumbnail_src: obj => new URL(obj['thumbnail'], window.location.origin).pathname,
+  thumbnail_encoding: () => '{}',
+
+  // unavailable in public API
+  // 'resource_count': 'num_resources',
+  // 'root_id': 'root_id',
+};
+
+/**
+ * Convert a content node from the public API into a content node for the Studio frontend
+ * @param {string} id - the actual ID of the node on Studio's side
+ * @param {string} root_id - the root content node ID
+ * @param {PublicContentNode} publicNode
+ * @return {Promise<{id}>}
+ */
+export async function convertContentNodeResponse(id, root_id, publicNode) {
+  const contentNode = {
+    // the public API does not return the actual id, but 'node_id' as the id, so this requires
+    // us to know what the actual id is
+    id,
+    // The public API returns the channel ID as the root_id
+    root_id,
+  };
+
+  // Convert the response node into a content node
+  for (const [key, fieldMapper] of Object.entries(CONTENT_NODE_FIELD_MAP)) {
+    if (isFunction(fieldMapper)) {
+      contentNode[key] = fieldMapper(publicNode);
+    } else {
+      contentNode[key] = publicNode[fieldMapper];
+    }
+  }
+
+  // If the parent is the channel, then set the parent to the root_id
+  if (contentNode.parent === contentNode.channel_id) {
+    contentNode.parent = root_id;
+  }
+  return contentNode;
+}
+
+/**
+ * Get a channel from the public API
+ * @param {String} channelId
+ * @return {Promise<PublicChannelMetadata>}
+ */
+export function getChannel(channelId) {
+  return client.get(urls.publicchannel_detail(channelId)).then(response => response.data);
+}
+
+/**
+ * Get a content node from the public API
+ * @param {String} nodeId
+ * @return {Promise<PublicContentNode>}
+ */
+export function getContentNode(nodeId) {
+  return client.get(urls.publiccontentnode_detail(nodeId)).then(response => response.data);
+}
+
+/**
+ * @typedef {Object} PublicFile
+ * @property {string} id
+ * @property {string} contentnode
+ * @property {string} preset
+ * @property {string} lang
+ * @property {boolean} supplementary
+ * @property {boolean} thumbnail
+ * @property {number} priority
+ * @property {number} file_size
+ * @property {string} checksum
+ * @property {string} extension
+ */
+
+/**
+ * @typedef {Object} PublicContentNode
+ * @property {string} id
+ * @property {string} content_id
+ * @property {string} channel_id
+ * @property {string} parent
+ * @property {string} title
+ * @property {string} description
+ * @property {string} kind
+ * @property {string} author
+ * @property {string} provider
+ * @property {string} aggregator
+ * @property {number} duration
+ * @property {number} lft
+ * @property {number} rght
+ * @property {string[]} learning_activities
+ * @property {string[]} grade_levels
+ * @property {string[]} accessibility_labels
+ * @property {string[]} categories
+ * @property {string[]} resource_types
+ * @property {string[]} tags
+ * @property {boolean} coach_content
+ * @property {string} options - JSON string
+ * @property {string} thumbnail - storage URL path
+ * @property {string} license_name
+ * @property {string} license_description
+ * @property {string} license_owner
+ * @property {number} num_coach_contents
+ * @property {{id: string, lang_name: string, lang_code: string, lang_direction: string}} lang
+ * @property {PublicFile[]} files
+ */
+
+/**
+ * @typedef {Object} PublicChannelMetadata
+ * @property {string} id
+ * @property {string} root
+ * @property {string} name
+ * @property {string} description
+ * @property {string} thumbnail - data URI
+ * @property {string[]} included_languages
+ * @property {string} lang_code
+ * @property {string} lang_name
+ * @property {string} author
+ * @property {boolean} public
+ * @property {number} published_size
+ * @property {number} num_coach_contents
+ * @property {number} total_resource_count
+ * @property {number} version
+ * @property {string} last_published
+ * @property {string} last_updated
+ *
+ */
diff --git a/contentcuration/contentcuration/frontend/shared/data/resources.js b/contentcuration/contentcuration/frontend/shared/data/resources.js
index 3843753b6b..2575bfc3f9 100644
--- a/contentcuration/contentcuration/frontend/shared/data/resources.js
+++ b/contentcuration/contentcuration/frontend/shared/data/resources.js
@@ -1347,10 +1347,11 @@ export const ContentNode = new TreeResource({
    * @param {string} target
    * @param {string} position
    * @param {Boolean} isCreate
+   * @param {Object} [sourceNode]
    * @param {Function<Promise<ContentNode>>} callback
    * @return {Promise<ContentNode>}
    */
-  resolveTreeInsert(id, target, position, isCreate, callback) {
+  resolveTreeInsert({ id, target, position, isCreate, sourceNode = null }, callback) {
     // First, resolve parent so we can determine the sort order, but also to determine
     // the tree so we can temporarily lock it while we determine those values locally
     return this.resolveParent(target, position).then(parent => {
@@ -1361,8 +1362,12 @@ export const ContentNode = new TreeResource({
       // Using root_id, we'll keep this locked while we handle this, so no other operations
       // happen while we're potentially waiting for some data we need (siblings, source node)
       return this.treeLock(parent.root_id, () => {
-        // Don't trigger fetch, if this is specified as a creation
-        const getNode = isCreate ? this.table.get(id) : this.get(id, false);
+        // Resolve to sourceNode passed in if a create
+        let getNode = Promise.resolve(sourceNode);
+        if (!sourceNode) {
+          // Don't trigger fetch, if this is specified as a creation
+          getNode = isCreate ? this.table.get(id) : this.get(id, false);
+        }
 
         // Preload the ID we're referencing, and get siblings to determine sort order
         return Promise.all([getNode, this.where({ parent: parent.id }, false)]).then(
@@ -1429,10 +1434,12 @@ export const ContentNode = new TreeResource({
     const prepared = this._prepareAdd(obj);
 
     return this.resolveTreeInsert(
-      prepared.id,
-      prepared.parent,
-      RELATIVE_TREE_POSITIONS.LAST_CHILD,
-      true,
+      {
+        id: prepared.id,
+        target: prepared.parent,
+        position: RELATIVE_TREE_POSITIONS.LAST_CHILD,
+        isCreate: true,
+      },
       data => {
         return this.transaction({ mode: 'rw' }, CHANGES_TABLE, () => {
           const obj = { ...prepared, ...data.payload };
@@ -1445,7 +1452,7 @@ export const ContentNode = new TreeResource({
   },
 
   move(id, target, position = RELATIVE_TREE_POSITIONS.FIRST_CHILD) {
-    return this.resolveTreeInsert(id, target, position, false, data => {
+    return this.resolveTreeInsert({ id, target, position, isCreate: false }, data => {
       return this.transaction({ mode: 'rw' }, CHANGES_TABLE, async () => {
         const payload = await this.tableMove(data);
         const change = new MovedChange(data.changeData);
@@ -1480,9 +1487,16 @@ export const ContentNode = new TreeResource({
    * @param {string} target The ID of the target node used for positioning
    * @param {string} position The position relative to `target`
    * @param {Object|null} [excluded_descendants] a map of node_ids to exclude from the copy
+   * @param {Object|null} [sourceNode] a source node to use for the copy instead of fetching
    * @return {Promise}
    */
-  copy(id, target, position = RELATIVE_TREE_POSITIONS.LAST_CHILD, excluded_descendants = null) {
+  copy(
+    id,
+    target,
+    position = RELATIVE_TREE_POSITIONS.LAST_CHILD,
+    excluded_descendants = null,
+    sourceNode = null
+  ) {
     if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test') {
       /* eslint-disable no-console */
       console.groupCollapsed(`Copying contentnode from ${id} with target ${target}`);
@@ -1491,7 +1505,7 @@ export const ContentNode = new TreeResource({
       /* eslint-enable */
     }
 
-    return this.resolveTreeInsert(id, target, position, true, data => {
+    return this.resolveTreeInsert({ id, target, position, isCreate: true, sourceNode }, data => {
       data.changeData.excluded_descendants = excluded_descendants;
       data.changeData.mods = {};
 
diff --git a/contentcuration/contentcuration/frontend/shared/views/form/DropdownWrapper.vue b/contentcuration/contentcuration/frontend/shared/views/form/DropdownWrapper.vue
index 56c38b0f58..63c39805cf 100644
--- a/contentcuration/contentcuration/frontend/shared/views/form/DropdownWrapper.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/form/DropdownWrapper.vue
@@ -31,8 +31,12 @@
         default: 'div',
       },
       menuHeight: {
-        type: Number,
+        type: [Number, String],
         default: 300,
+        validator: value => {
+          const parsed = parseInt(value, 10);
+          return !isNaN(parsed) && parsed > 0;
+        },
       },
     },
     data() {
diff --git a/contentcuration/search/viewsets/contentnode.py b/contentcuration/search/viewsets/contentnode.py
index 676698031d..199c78817d 100644
--- a/contentcuration/search/viewsets/contentnode.py
+++ b/contentcuration/search/viewsets/contentnode.py
@@ -104,38 +104,44 @@ class SearchContentNodeViewSet(ReadOnlyValuesViewset):
         "id": "contentnode__id",
         "content_id": "contentnode__content_id",
         "node_id": "contentnode__node_id",
+        "root_id": "channel__main_tree_id",
         "title": "contentnode__title",
         "description": "contentnode__description",
         "author": "contentnode__author",
         "provider": "contentnode__provider",
-        "kind__kind": "contentnode__kind__kind",
+        "kind": "contentnode__kind__kind",
         "thumbnail_encoding": "contentnode__thumbnail_encoding",
         "published": "contentnode__published",
         "modified": "contentnode__modified",
-        "parent_id": "contentnode__parent_id",
+        "parent": "contentnode__parent_id",
         "changed": "contentnode__changed",
+        "public": "channel__public",
     }
 
     values = (
+        "channel__public",
+        "channel__main_tree_id",
         "contentnode__id",
         "contentnode__content_id",
         "contentnode__node_id",
-        "contentnode__title",
-        "contentnode__description",
-        "contentnode__author",
-        "contentnode__provider",
         "contentnode__kind__kind",
-        "contentnode__thumbnail_encoding",
-        "contentnode__published",
-        "contentnode__modified",
         "contentnode__parent_id",
-        "contentnode__changed",
         "channel_id",
         "resource_count",
-        "thumbnail_checksum",
-        "thumbnail_extension",
-        "content_tags",
         "original_channel_name",
+
+        # TODO: currently loading nodes separately
+        # "thumbnail_checksum",
+        # "thumbnail_extension",
+        # "content_tags",
+        # "contentnode__title",
+        # "contentnode__description",
+        # "contentnode__author",
+        # "contentnode__provider",
+        # "contentnode__changed",
+        # "contentnode__thumbnail_encoding",
+        # "contentnode__published",
+        # "contentnode__modified",
     )
 
     def annotate_queryset(self, queryset):

From aa304a849647d2e587bdcc8e7ce585ec428d28cb Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Tue, 13 Jun 2023 15:32:53 -0700
Subject: [PATCH 05/63] Remove console.log

---
 .../frontend/channelEdit/vuex/contentNode/actions.js             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
index 8177d2b53b..89eba97c59 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
@@ -401,7 +401,6 @@ export function copyContentNode(
 ) {
   // First, this will parse the tree and create the copy the local tree nodes,
   // with a `source_id` of the source node then create the content node copies
-  console.log('copyContentNode', id, target, position, excluded_descendants, { ...sourceNode });
   return ContentNode.copy(id, target, position, excluded_descendants, sourceNode).then(node => {
     context.commit('ADD_CONTENTNODE', node);
     return node;

From d6ed7952f7328f5a4201a419f9b665c5f22b2f92 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Tue, 13 Jun 2023 16:06:25 -0700
Subject: [PATCH 06/63] Catch any and all errors in exporting channels.

---
 .../commands/export_channels_to_kolibri_public.py     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/contentcuration/kolibri_public/management/commands/export_channels_to_kolibri_public.py b/contentcuration/kolibri_public/management/commands/export_channels_to_kolibri_public.py
index f20206abf0..b4b88ab4ba 100644
--- a/contentcuration/kolibri_public/management/commands/export_channels_to_kolibri_public.py
+++ b/contentcuration/kolibri_public/management/commands/export_channels_to_kolibri_public.py
@@ -46,10 +46,13 @@ def _republish_problem_channels(self):
         )
 
         for channel in channel_qs:
-            kolibri_temp_db = create_content_database(channel, True, chef_user.id, False)
-            os.remove(kolibri_temp_db)
-            channel.last_published = timezone.now()
-            channel.save()
+            try:
+                kolibri_temp_db = create_content_database(channel, True, chef_user.id, False)
+                os.remove(kolibri_temp_db)
+                channel.last_published = timezone.now()
+                channel.save()
+            except Exception as e:
+                logger.exception("Failed to export channel {} to kolibri_public because of error: {}".format(channel.id, e))
 
     def _export_channel(self, channel_id):
         logger.info("Putting channel {} into kolibri_public".format(channel_id))

From 57e956473c50dd0b65409775ab6058e96635efd8 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Tue, 6 Jun 2023 13:39:37 -0700
Subject: [PATCH 07/63] Proper updating of resource counts when a change occurs

---
 .editorconfig                                 |   3 +
 .../data/__tests__/applyRemoteChanges.spec.js | 271 ++++++++++++
 .../shared/data/applyRemoteChanges.js         | 405 ++++++++++++++----
 .../frontend/shared/data/changes.js           |  57 +--
 .../frontend/shared/data/constants.js         |   7 +
 .../frontend/shared/data/locks.js             |  24 ++
 .../frontend/shared/data/resources.js         |  34 ++
 .../frontend/shared/data/serverSync.js        | 195 +++++----
 .../frontend/shared/utils/deferred.js         |  67 +++
 jest_config/jest.conf.js                      |   2 +-
 jest_config/setup.js                          |  11 +-
 package.json                                  |   1 +
 12 files changed, 884 insertions(+), 193 deletions(-)
 create mode 100644 contentcuration/contentcuration/frontend/shared/data/__tests__/applyRemoteChanges.spec.js
 create mode 100644 contentcuration/contentcuration/frontend/shared/data/locks.js
 create mode 100644 contentcuration/contentcuration/frontend/shared/utils/deferred.js

diff --git a/.editorconfig b/.editorconfig
index 1f49431c53..8db7923734 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,8 @@
 root = true
 
+[*]
+max_line_length = 100
+
 [*.js]
 indent_size = 2
 
diff --git a/contentcuration/contentcuration/frontend/shared/data/__tests__/applyRemoteChanges.spec.js b/contentcuration/contentcuration/frontend/shared/data/__tests__/applyRemoteChanges.spec.js
new file mode 100644
index 0000000000..fc9d6d3f6c
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/data/__tests__/applyRemoteChanges.spec.js
@@ -0,0 +1,271 @@
+import { CHANGE_TYPES } from '../constants';
+import { ChangeDispatcher, ChangeStream, resourceCounts } from '../applyRemoteChanges';
+import Deferred from 'shared/utils/deferred';
+import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
+import { RolesNames } from 'shared/leUtils/Roles';
+
+function tick() {
+  return new Promise(resolve => {
+    setTimeout(resolve, 0);
+  });
+}
+
+describe('ChangeStream', () => {
+  let dispatchers;
+  let changeStream;
+
+  beforeEach(() => {
+    dispatchers = [
+      {
+        apply: jest.fn(() => Promise.resolve()),
+      },
+      {
+        apply: jest.fn(() => Promise.resolve()),
+      },
+    ];
+    changeStream = new ChangeStream(dispatchers);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('constructor', () => {
+    it('should initialize with the provided dispatchers', () => {
+      expect(changeStream._dispatchers).toBe(dispatchers);
+    });
+
+    it('should create a WritableStream instance', () => {
+      changeStream.init();
+      expect(changeStream._stream).toBeDefined();
+    });
+
+    it('should create a writer for the stream', () => {
+      changeStream.init();
+      expect(changeStream._writer).toBeDefined();
+    });
+  });
+
+  describe('write', () => {
+    let writeSpy;
+
+    beforeEach(() => {
+      dispatchers = [];
+      for (let i = 0; i < 2; i++) {
+        const deferred = new Deferred();
+        const dispatcher = {
+          deferred,
+          apply: jest.fn(() => deferred.promise()),
+        };
+        dispatchers.push(dispatcher);
+      }
+      changeStream = new ChangeStream(dispatchers);
+      changeStream.init();
+      writeSpy = jest.spyOn(changeStream._writer, 'write');
+    });
+
+    it('should acquire a lock and await the writer ready promise', async () => {
+      const changes = [{ id: 1 }, { id: 2 }];
+      const result = changeStream.write(changes);
+      const resultDeferred = Deferred.fromPromise(result);
+
+      await tick();
+
+      // All changes should be written to the stream sink
+      expect(writeSpy.mock.calls).toHaveLength(2);
+      expect(writeSpy).toHaveBeenCalledWith(changes[0]);
+      expect(writeSpy).toHaveBeenCalledWith(changes[1]);
+
+      // the write should be awaiting the dispatcher's apply
+      expect(dispatchers[0].apply).toHaveBeenCalledWith(changes[0]);
+      expect(dispatchers[1].apply).not.toHaveBeenCalledWith(changes[0]);
+
+      // The result should not be resolved yet, until all dispatchers have applied
+      expect(resultDeferred.isFulfilled).toBe(false);
+
+      for (const dispatcher of dispatchers) {
+        dispatcher.deferred.resolve();
+      }
+
+      // Should resolve, otherwise it'll hit the Jest timeout
+      await result;
+    });
+  });
+
+  describe('doWrite', () => {
+    it('should apply the change to each dispatcher', async () => {
+      const change = { id: 1 };
+      await changeStream.doWrite(change);
+
+      for (const dispatcher of dispatchers) {
+        expect(dispatcher.apply).toHaveBeenCalledWith(change);
+      }
+    });
+  });
+});
+
+describe('ChangeDispatcher', () => {
+  let changeDispatcher;
+
+  beforeEach(() => {
+    changeDispatcher = new ChangeDispatcher();
+  });
+
+  describe('apply', () => {
+    it('should call applyCreate if change type is CREATED and applyCreate is defined', async () => {
+      const change = { type: CHANGE_TYPES.CREATED };
+      const applyCreateResult = 'create result';
+      changeDispatcher.applyCreate = jest.fn().mockResolvedValue(applyCreateResult);
+
+      const result = await changeDispatcher.apply(change);
+
+      expect(changeDispatcher.applyCreate).toHaveBeenCalledWith(change);
+      expect(result).toBe(applyCreateResult);
+    });
+
+    it('should call applyUpdate if change type is UPDATED and applyUpdate is defined', async () => {
+      const change = { type: CHANGE_TYPES.UPDATED };
+      const applyUpdateResult = 'update result';
+      changeDispatcher.applyUpdate = jest.fn().mockResolvedValue(applyUpdateResult);
+
+      const result = await changeDispatcher.apply(change);
+
+      expect(changeDispatcher.applyUpdate).toHaveBeenCalledWith(change);
+      expect(result).toBe(applyUpdateResult);
+    });
+
+    it('should call applyDelete if change type is DELETED and applyDelete is defined', async () => {
+      const change = { type: CHANGE_TYPES.DELETED };
+      const applyDeleteResult = 'delete result';
+      changeDispatcher.applyDelete = jest.fn().mockResolvedValue(applyDeleteResult);
+
+      const result = await changeDispatcher.apply(change);
+
+      expect(changeDispatcher.applyDelete).toHaveBeenCalledWith(change);
+      expect(result).toBe(applyDeleteResult);
+    });
+
+    it('should call applyMove if change type is MOVED and applyMove is defined', async () => {
+      const change = { type: CHANGE_TYPES.MOVED };
+      const applyMoveResult = 'move result';
+      changeDispatcher.applyMove = jest.fn().mockResolvedValue(applyMoveResult);
+
+      const result = await changeDispatcher.apply(change);
+
+      expect(changeDispatcher.applyMove).toHaveBeenCalledWith(change);
+      expect(result).toBe(applyMoveResult);
+    });
+
+    it('should call applyCopy if change type is COPIED and applyCopy is defined', async () => {
+      const change = { type: CHANGE_TYPES.COPIED };
+      const applyCopyResult = 'copy result';
+      changeDispatcher.applyCopy = jest.fn().mockResolvedValue(applyCopyResult);
+
+      const result = await changeDispatcher.apply(change);
+
+      expect(changeDispatcher.applyCopy).toHaveBeenCalledWith(change);
+      expect(result).toBe(applyCopyResult);
+    });
+
+    it('should call applyPublish if change type is PUBLISHED and applyPublish is defined', async () => {
+      const change = { type: CHANGE_TYPES.PUBLISHED };
+      const applyPublishResult = 'publish result';
+      changeDispatcher.applyPublish = jest.fn().mockResolvedValue(applyPublishResult);
+
+      const result = await changeDispatcher.apply(change);
+
+      expect(changeDispatcher.applyPublish).toHaveBeenCalledWith(change);
+      expect(result).toBe(applyPublishResult);
+    });
+  });
+});
+
+describe('ResourceCounts', () => {
+  describe('_applyDiff', () => {
+    it('should return the correct diff when changedNode is a folder and multiplier is 1', () => {
+      const changedNode = {
+        kind: ContentKindsNames.TOPIC,
+        total_count: 10,
+        resource_count: 5,
+        coach_count: 3,
+      };
+      const multiplier = 1;
+      const ancestor = {
+        total_count: 100,
+        resource_count: 50,
+        coach_count: 30,
+      };
+
+      const diff = resourceCounts._applyDiff(changedNode, multiplier, ancestor);
+
+      expect(diff.total_count).toBe(110); // (1 * 10) + 100
+      expect(diff.resource_count).toBe(55); // (1 * 5) + 50
+      expect(diff.coach_count).toBe(33); // (1 * 3) + 30
+    });
+
+    it('should return the correct diff when changedNode is a folder and multiplier is -1', () => {
+      const changedNode = {
+        kind: ContentKindsNames.TOPIC,
+        total_count: 10,
+        resource_count: 5,
+        coach_count: 3,
+      };
+      const multiplier = -1;
+      const ancestor = {
+        total_count: 100,
+        resource_count: 50,
+        coach_count: 30,
+      };
+
+      const diff = resourceCounts._applyDiff(changedNode, multiplier, ancestor);
+
+      expect(diff.total_count).toBe(90); // (-1 * 10) + 100
+      expect(diff.resource_count).toBe(45); // (-1 * 5) + 50
+      expect(diff.coach_count).toBe(27); // (-1 * 3) + 30
+    });
+
+    it('should return the correct diff when changedNode is not a folder and counts are 0', () => {
+      const changedNode = {
+        kind: ContentKindsNames.AUDIO,
+        total_count: 0,
+        resource_count: 0,
+        coach_count: 0,
+        role_visibility: RolesNames.LEARNER,
+      };
+      const multiplier = 1;
+      const ancestor = {
+        total_count: 50,
+        resource_count: 20,
+        coach_count: 10,
+      };
+
+      const diff = resourceCounts._applyDiff(changedNode, multiplier, ancestor);
+
+      expect(diff.total_count).toBe(51); // 1 + 50
+      expect(diff.resource_count).toBe(21); // 1 + 20
+      expect(diff.coach_count).toBe(10); // No change
+    });
+
+    it('should return the correct diff when changedNode is not a folder but coach content', () => {
+      const changedNode = {
+        kind: ContentKindsNames.AUDIO,
+        total_count: 0,
+        resource_count: 0,
+        coach_count: 0,
+        role_visibility: RolesNames.COACH,
+      };
+      const multiplier = -1;
+      const ancestor = {
+        total_count: 50,
+        resource_count: 20,
+        coach_count: 10,
+      };
+
+      const diff = resourceCounts._applyDiff(changedNode, multiplier, ancestor);
+
+      expect(diff.total_count).toBe(49); // 50 - 1
+      expect(diff.resource_count).toBe(19); // 20 - 1
+      expect(diff.coach_count).toBe(9); // 10 - 1
+    });
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js b/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js
index ea10bc6768..c30741ac77 100644
--- a/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js
+++ b/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js
@@ -1,9 +1,12 @@
 import Dexie from 'dexie';
 import sortBy from 'lodash/sortBy';
 import logging from '../logging';
-import { CHANGE_TYPES, TABLE_NAMES } from './constants';
+import { CHANGE_TYPES, TABLE_NAMES, LOCK_NAMES } from './constants';
 import db from './db';
 import { INDEXEDDB_RESOURCES } from './registry';
+import { acquireLock } from 'shared/data/locks';
+import { RolesNames } from 'shared/leUtils/Roles';
+import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 
 const { CREATED, DELETED, UPDATED, MOVED, PUBLISHED, SYNCED, DEPLOYED } = CHANGE_TYPES;
 
@@ -37,6 +40,10 @@ export function collectChanges(changes) {
   return collectedChanges;
 }
 
+function sortChanges(changes) {
+  return sortBy(changes, ['server_rev', 'rev']);
+}
+
 /**
  * @param {Object} change - The change object
  * @param {String|Function} args[] - string table names with callback at the end
@@ -50,108 +57,348 @@ function transaction(change, ...args) {
   });
 }
 
-function applyCreate(change) {
-  return transaction(change, () => {
-    const table = db.table(change.table);
-    return table
-      .put(change.obj, !table.schema.primKey.keyPath ? change.key : undefined)
-      .then(() => change.obj);
-  });
-}
-
-function applyUpdate(change) {
-  return transaction(change, () => {
-    return db
-      .table(change.table)
-      .where(':id')
-      .equals(change.key)
-      .modify(obj => applyMods(obj, change.mods));
-  });
+/**
+ * Class consolidating code related to mapping changes to the appropriate apply function
+ * and logging related errors
+ */
+export class ChangeDispatcher {
+  async apply(change) {
+    let result = null;
+    try {
+      if (change.type === CHANGE_TYPES.CREATED && this.applyCreate) {
+        result = await this.applyCreate(change);
+      } else if (change.type === CHANGE_TYPES.UPDATED && this.applyUpdate) {
+        result = await this.applyUpdate(change);
+      } else if (change.type === CHANGE_TYPES.DELETED && this.applyDelete) {
+        result = await this.applyDelete(change);
+      } else if (change.type === CHANGE_TYPES.MOVED && this.applyMove) {
+        result = await this.applyMove(change);
+      } else if (change.type === CHANGE_TYPES.COPIED && this.applyCopy) {
+        result = await this.applyCopy(change);
+      } else if (change.type === CHANGE_TYPES.PUBLISHED && this.applyPublish) {
+        result = await this.applyPublish(change);
+      }
+    } catch (e) {
+      logging.error(e, {
+        filename: 'change.json',
+        // strip csrf token from headers
+        data: JSON.stringify(change),
+        contentType: 'application/json',
+      });
+    }
+    return result;
+  }
 }
 
-function applyDelete(change) {
-  return transaction(change, () => {
-    return db.table(change.table).delete(change.key);
-  });
-}
+class ReturnedChanges extends ChangeDispatcher {
+  /**
+   * @param {CreatedChange} change
+   * @return {Promise<void>}
+   */
+  applyCreate(change) {
+    return transaction(change, () => {
+      const table = db.table(change.table);
+      return table
+        .put(change.obj, !table.schema.primKey.keyPath ? change.key : undefined)
+        .then(() => change.obj);
+    });
+  }
 
-function applyMove(change) {
-  const resource = INDEXEDDB_RESOURCES[change.table];
-  if (!resource || !resource.tableMove) {
-    return Promise.resolve();
+  /**
+   * @param {UpdatedChange} change
+   * @return {Promise<void>}
+   */
+  applyUpdate(change) {
+    return transaction(change, () => {
+      return db
+        .table(change.table)
+        .where(':id')
+        .equals(change.key)
+        .modify(obj => applyMods(obj, change.mods));
+    });
   }
 
-  const { key, target, position } = change;
-  return resource.resolveTreeInsert({ id: key, target, position, isCreate: false }, data => {
+  /**
+   * @param {DeletedChange} change
+   * @return {Promise<void>}
+   */
+  applyDelete(change) {
     return transaction(change, () => {
-      return resource.tableMove(data);
+      return db.table(change.table).delete(change.key);
     });
-  });
+  }
+
+  /**
+   * @param {MovedChange} change
+   * @return {Promise<void>}
+   */
+  applyMove(change) {
+    const resource = INDEXEDDB_RESOURCES[change.table];
+    if (!resource || !resource.tableMove) {
+      return Promise.resolve();
+    }
+
+    const { key, target, position } = change;
+    return resource.resolveTreeInsert({ id: key, target, position, isCreate: false }, data => {
+      return transaction(change, () => {
+        return resource.tableMove(data);
+      });
+    });
+  }
+
+  /**
+   * @param {CopiedChange} change
+   * @return {Promise<void>}
+   */
+  applyCopy(change) {
+    const resource = INDEXEDDB_RESOURCES[change.table];
+    if (!resource || !resource.tableCopy) {
+      return Promise.resolve();
+    }
+
+    const { key, target, position, from_key } = change;
+    // copying takes the ID of the node to copy, so we use `from_key`
+    return resource.resolveTreeInsert({ id: from_key, target, position, isCreate: true }, data => {
+      return transaction(change, () => {
+        // Update the ID on the payload to match the received change, since isCreate=true
+        // would generate new IDs
+        data.payload.id = key;
+        return resource.tableCopy(data);
+      });
+    });
+  }
+
+  /**
+   * @param {PublishedChange} change
+   * @return {Promise<void>}
+   */
+  applyPublish(change) {
+    if (change.table !== TABLE_NAMES.CHANNEL) {
+      return Promise.resolve();
+    }
+
+    // Publish changes associate with the channel, but we open a transaction on contentnode
+    return transaction(change, TABLE_NAMES.CONTENTNODE, () => {
+      return db
+        .table(TABLE_NAMES.CONTENTNODE)
+        .where({ channel_id: change.channel_id })
+        .modify({ changed: false, published: true });
+    });
+  }
 }
 
-function applyCopy(change) {
-  const resource = INDEXEDDB_RESOURCES[change.table];
-  if (!resource || !resource.tableCopy) {
-    return Promise.resolve();
+/**
+ * Updates aggregate counts on ancestors when a change occurs
+ */
+class ResourceCounts extends ChangeDispatcher {
+  async apply(change) {
+    // Resource counts are only applicable to content nodes
+    if (change.table !== TABLE_NAMES.CONTENTNODE) {
+      return null;
+    }
+    // When there's a current transaction, delay until it's complete
+    if (Dexie.currentTransaction) {
+      return new Promise((resolve, reject) => {
+        Dexie.currentTransaction.on('complete', () => this.apply(change).then(resolve, reject));
+      });
+    }
+    return super.apply(change);
   }
 
-  const { key, target, position, from_key } = change;
-  // copying takes the ID of the node to copy, so we use `from_key`
-  return resource.resolveTreeInsert({ id: from_key, target, position, isCreate: true }, data => {
-    return transaction(change, () => {
-      // Update the ID on the payload to match the received change, since isCreate=true
-      // would generate new IDs
-      data.payload.id = key;
-      return resource.tableCopy(data);
+  /**
+   * @return {ContentNode}
+   */
+  get resource() {
+    return INDEXEDDB_RESOURCES[TABLE_NAMES.CONTENTNODE];
+  }
+
+  /**
+   * @return {Dexie.Table}
+   */
+  get table() {
+    return this.resource.table;
+  }
+
+  /**
+   * Generates the diff to apply to ancestor nodes that updates their counts appropriately
+   *
+   * @typedef {{
+   *  kind: string,
+   *  total_count: number,
+   *  resource_count: number,
+   *  coach_count: number,
+   *  role_visibility: string
+   * }} Node
+   * @param {Node} changedNode
+   * @param {number} multiplier
+   * @param {{total_count: number, resource_count: number, coach_count: number}} ancestor
+   * @return {{total_count: number, resource_count: number, coach_count: number}}
+   * @private
+   */
+  _applyDiff(changedNode, multiplier, ancestor) {
+    const isFolder = changedNode.kind === ContentKindsNames.TOPIC;
+    return {
+      total_count: multiplier * (changedNode.total_count || 1) + ancestor.total_count,
+      resource_count:
+        multiplier * (isFolder ? changedNode.resource_count || 0 : 1) + ancestor.resource_count,
+      coach_count:
+        multiplier *
+          (isFolder
+            ? changedNode.coach_count || 0
+            : Number(changedNode.role_visibility === RolesNames.COACH)) +
+        ancestor.coach_count,
+    };
+  }
+
+  /**
+   * @param {CreatedChange} change
+   * @return {Promise<void>}
+   */
+  async applyCreate(change) {
+    await this.resource.updateAncestors(
+      { id: change.key, ignoreChanges: true },
+      this._applyDiff.bind(this, change.obj, 1)
+    );
+  }
+
+  /**
+   * @param {UpdatedChange} change
+   * @return {Promise<void>}
+   */
+  async applyUpdate(change) {
+    // If the role visibility hasn't changed, we don't need to update the ancestor counts
+    if (!change.mods.role_visibility) {
+      return;
+    }
+
+    await this.resource.updateAncestors({ id: change.key, ignoreChanges: true }, ancestor => {
+      return {
+        coach_count:
+          ancestor.coach_count + (change.mods.role_visibility === RolesNames.COACH ? 1 : -1),
+      };
     });
-  });
+  }
+
+  /**
+   * @param {DeletedChange} change
+   * @return {Promise<void>}
+   */
+  async applyDelete(change) {
+    await this.resource.updateAncestors(
+      { id: change.key, ignoreChanges: true },
+      this._applyDiff.bind(this, change.oldObj, -1)
+    );
+  }
+
+  /**
+   * @param {MovedChange} change
+   * @return {Promise<void>}
+   */
+  async applyMove(change) {
+    // Only if the node is being moved to a new parent do we need to update the ancestor counts
+    if (change.oldParent === change.parent) {
+      return;
+    }
+
+    const node = await this.table.get(change.key);
+    await this.resource.updateAncestors(
+      { id: change.oldParent, includeSelf: true, ignoreChanges: true },
+      this._applyDiff.bind(this, node, -1)
+    );
+    await this.resource.updateAncestors(
+      { id: change.parent, includeSelf: true, ignoreChanges: true },
+      this._applyDiff.bind(this, node, 1)
+    );
+  }
+
+  /**
+   * @param {CopiedChange} change
+   * @return {Promise<void>}
+   */
+  async applyCopy(change) {
+    const node = await this.table.get(change.key);
+    await this.resource.updateAncestors(
+      { id: change.key, ignoreChanges: true },
+      this._applyDiff.bind(this, node, 1)
+    );
+  }
 }
 
-function applyPublish(change) {
-  if (change.table !== TABLE_NAMES.CHANNEL) {
-    return Promise.resolve();
+/**
+ * A wrapper class that uses a WritableStream to queue, process, and apply changes to the database
+ * through dispatcher class instances
+ */
+export class ChangeStream {
+  /**
+   * @param {ChangeDispatcher[]} dispatchers
+   */
+  constructor(dispatchers) {
+    this._dispatchers = dispatchers;
+    this._stream = null;
+    this._writer = null;
   }
 
-  // Publish changes associate with the channel, but we open a transaction on contentnode
-  return transaction(change, TABLE_NAMES.CONTENTNODE, () => {
-    return db
-      .table(TABLE_NAMES.CONTENTNODE)
-      .where({ channel_id: change.channel_id })
-      .modify({ changed: false, published: true });
-  });
+  /**
+   * Delay initialization of the stream, otherwise this could get invoked before
+   * the ponyfill is loaded in our Jest test environment
+   */
+  init() {
+    this._stream = new WritableStream({
+      write: change => this.doWrite(change),
+    });
+    this._writer = this._stream.getWriter();
+  }
+
+  /**
+   * @param {Object[]} changes
+   * @return {Promise<void>}
+   */
+  write(changes) {
+    if (!this._stream) {
+      this.init();
+    }
+
+    return acquireLock({ name: LOCK_NAMES.APPLY_CHANGES }, async () => {
+      for (const change of sortChanges(changes)) {
+        // write to the queue but not necessarily applied yet
+        this._writer.write(change);
+      }
+      // return/await here ensures all changes are applied, which allows us to release the lock
+      return this._writer.ready;
+    });
+  }
+
+  /**
+   * @param {Object} change - A change object
+   * @return {Promise<void>}
+   */
+  async doWrite(change) {
+    for (const dispatcher of this._dispatchers) {
+      await dispatcher.apply(change);
+    }
+  }
 }
 
+const returnedChanges = new ReturnedChanges();
+/**
+ * Export resourceCounts instance to update aggregate counts on ancestors when a change occurs
+ * @type {ResourceCounts}
+ */
+export const resourceCounts = new ResourceCounts();
+/**
+ * Export changeStream instance to write returned changes to the database from sync requests
+ * @type {ChangeStream}
+ */
+export const changeStream = new ChangeStream([returnedChanges, resourceCounts]);
+
 /**
  * @see https://github.com/dfahlander/Dexie.js/blob/master/addons/Dexie.Syncable/src/apply-changes.js
  * @return {Promise<Array>}
  */
 export default async function applyChanges(changes) {
   const results = [];
-  for (const change of sortBy(changes, ['server_rev', 'rev'])) {
-    let result;
-    try {
-      if (change.type === CHANGE_TYPES.CREATED) {
-        result = await applyCreate(change);
-      } else if (change.type === CHANGE_TYPES.UPDATED) {
-        result = await applyUpdate(change);
-      } else if (change.type === CHANGE_TYPES.DELETED) {
-        result = await applyDelete(change);
-      } else if (change.type === CHANGE_TYPES.MOVED) {
-        result = await applyMove(change);
-      } else if (change.type === CHANGE_TYPES.COPIED) {
-        result = await applyCopy(change);
-      } else if (change.type === CHANGE_TYPES.PUBLISHED) {
-        result = await applyPublish(change);
-      }
-    } catch (e) {
-      logging.error(e, {
-        filename: 'change.json',
-        // strip csrf token from headers
-        data: JSON.stringify(change),
-        contentType: 'application/json',
-      });
-    }
-
+  for (const change of sortChanges(changes)) {
+    const result = await returnedChanges.apply(change);
     if (result) {
       results.push(result);
     }
diff --git a/contentcuration/contentcuration/frontend/shared/data/changes.js b/contentcuration/contentcuration/frontend/shared/data/changes.js
index 6065218d10..4129ea1515 100644
--- a/contentcuration/contentcuration/frontend/shared/data/changes.js
+++ b/contentcuration/contentcuration/frontend/shared/data/changes.js
@@ -6,6 +6,7 @@ import isUndefined from 'lodash/isUndefined';
 import omit from 'lodash/omit';
 import sortBy from 'lodash/sortBy';
 import logging from '../logging';
+import { resourceCounts } from './applyRemoteChanges';
 import db, { CLIENTID } from 'shared/data/db';
 import { promiseChunk } from 'shared/utils/helpers';
 import {
@@ -208,7 +209,7 @@ function omitIgnoredSubFields(obj) {
 export class Change {
   constructor({ type, key, table, source } = {}) {
     this.setAndValidateLookup(type, 'type', CHANGE_TYPES_LOOKUP);
-    this.setAndValidateNotNull(key, 'key');
+    this.setAndValidateIsDefined(key, 'key');
     this.setAndValidateLookup(table, 'table', TABLE_NAMES_LOOKUP);
     if (!INDEXEDDB_RESOURCES[this.table].syncable) {
       const error = new ReferenceError(`${this.table} is not a syncable table`);
@@ -217,6 +218,7 @@ export class Change {
     }
     this.setAndValidateString(source, 'source');
   }
+
   get changeType() {
     return this.constructor.name;
   }
@@ -244,28 +246,24 @@ export class Change {
     }
     this[name] = value;
   }
-  validateNotUndefined(value, name) {
-    if (isUndefined(value)) {
+
+  validateIsDefined(value, name) {
+    if (isNull(value) || isUndefined(value)) {
       const error = new TypeError(
-        `${name} is required for a ${this.changeType} but it was undefined`
+        `${name} is required for a ${this.changeType} but it was ${
+          isNull(value) ? 'null' : 'undefined'
+        }`
       );
       logging.error(error, value);
       throw error;
     }
   }
-  setAndValidateNotUndefined(value, name) {
-    this.validateNotUndefined(value, name);
-    this[name] = value;
-  }
-  setAndValidateNotNull(value, name) {
-    this.validateNotUndefined(value, name);
-    if (isNull(value)) {
-      const error = new TypeError(`${name} is required for a ${this.changeType} but it was null`);
-      logging.error(error, value);
-      throw error;
-    }
+
+  setAndValidateIsDefined(value, name) {
+    this.validateIsDefined(value, name);
     this[name] = value;
   }
+
   validateObj(value, name) {
     if (!isPlainObject(value)) {
       const error = new TypeError(`${name} should be an object, but ${value} was passed instead`);
@@ -273,10 +271,12 @@ export class Change {
       throw error;
     }
   }
+
   setAndValidateObj(value, name, mapper = obj => obj) {
     this.validateObj(value, name);
     this[name] = mapper(value);
   }
+
   setAndValidateBoolean(value, name) {
     if (typeof value !== 'boolean') {
       const error = new TypeError(`${name} should be a boolean, but ${value} was passed instead`);
@@ -285,6 +285,7 @@ export class Change {
     }
     this[name] = value;
   }
+
   setAndValidateObjOrNull(value, name, mapper = obj => obj) {
     if (!isPlainObject(value) && !isNull(value)) {
       const error = new TypeError(
@@ -295,6 +296,7 @@ export class Change {
     }
     this[name] = mapper(value);
   }
+
   setAndValidateString(value, name) {
     if (typeof value !== 'string') {
       const error = new TypeError(`${name} should be a string, but ${value} was passed instead`);
@@ -303,13 +305,17 @@ export class Change {
     }
     this[name] = value;
   }
-  saveChange() {
+
+  async saveChange() {
     if (!this.channelOrUserIdSet) {
       throw new ReferenceError(
         `Attempted to save ${this.changeType} change for ${this.table} before setting channel_id and user_id`
       );
     }
-    return db[CHANGES_TABLE].add(this);
+    const rev = await db[CHANGES_TABLE].add(this);
+    // Do not await this
+    resourceCounts.apply(this);
+    return rev;
   }
 }
 
@@ -377,7 +383,7 @@ export class DeletedChange extends Change {
 }
 
 export class MovedChange extends Change {
-  constructor({ target, position, parent, ...fields }) {
+  constructor({ target, position, parent, oldParent, ...fields }) {
     fields.type = CHANGE_TYPES.MOVED;
     super(fields);
     if (this.table !== TABLE_NAMES.CONTENTNODE) {
@@ -385,9 +391,10 @@ export class MovedChange extends Change {
         `${this.changeType} is only supported by ${TABLE_NAMES.CONTENTNODE} table but ${this.table} was passed instead`
       );
     }
-    this.setAndValidateNotUndefined(target, 'target');
+    this.setAndValidateIsDefined(target, 'target');
     this.setAndValidateLookup(position, 'position', RELATIVE_TREE_POSITIONS_LOOKUP);
-    this.setAndValidateNotUndefined(parent, 'parent');
+    this.setAndValidateIsDefined(parent, 'parent');
+    this.setAndValidateIsDefined(oldParent, 'oldParent');
     this.setChannelAndUserId();
   }
 }
@@ -401,12 +408,12 @@ export class CopiedChange extends Change {
         `${this.changeType} is only supported by ${TABLE_NAMES.CONTENTNODE} table but ${this.table} was passed instead`
       );
     }
-    this.setAndValidateNotUndefined(from_key, 'from_key');
+    this.setAndValidateIsDefined(from_key, 'from_key');
     this.setAndValidateObj(mods, 'mods', omitIgnoredSubFields);
-    this.setAndValidateNotUndefined(target, 'target');
+    this.setAndValidateIsDefined(target, 'target');
     this.setAndValidateLookup(position, 'position', RELATIVE_TREE_POSITIONS_LOOKUP);
     this.setAndValidateObjOrNull(excluded_descendants, 'excluded_descendants');
-    this.setAndValidateNotUndefined(parent, 'parent');
+    this.setAndValidateIsDefined(parent, 'parent');
     this.setChannelAndUserId();
   }
 }
@@ -420,8 +427,8 @@ export class PublishedChange extends Change {
         `${this.changeType} is only supported by ${TABLE_NAMES.CHANNEL} table but ${this.table} was passed instead`
       );
     }
-    this.setAndValidateNotUndefined(version_notes, 'version_notes');
-    this.setAndValidateNotUndefined(language, 'language');
+    this.setAndValidateIsDefined(version_notes, 'version_notes');
+    this.setAndValidateIsDefined(language, 'language');
     this.setChannelAndUserId({ id: this.key });
   }
 }
diff --git a/contentcuration/contentcuration/frontend/shared/data/constants.js b/contentcuration/contentcuration/frontend/shared/data/constants.js
index 5f1ea5d357..709b251d1f 100644
--- a/contentcuration/contentcuration/frontend/shared/data/constants.js
+++ b/contentcuration/contentcuration/frontend/shared/data/constants.js
@@ -74,3 +74,10 @@ export const LAST_FETCHED = '__last_fetch';
 export const CURRENT_USER = 'CURRENT_USER';
 
 export const MAX_REV_KEY = 'max_rev';
+
+export const LOCK_NAMES = {
+  SYNC: 'sync',
+  SYNC_CHANNEL: 'sync_channel:{channel_id}',
+  SYNC_USER: 'sync_user',
+  APPLY_CHANGES: 'apply_changes',
+};
diff --git a/contentcuration/contentcuration/frontend/shared/data/locks.js b/contentcuration/contentcuration/frontend/shared/data/locks.js
new file mode 100644
index 0000000000..d6963e88d2
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/data/locks.js
@@ -0,0 +1,24 @@
+/**
+ * Acquire an exclusive lock on the given name using the browser's Web Locks API,
+ * and then run the given async function.
+ *
+ * @param {string} name
+ * @param {boolean} exclusive
+ * @param {function(): Promise} asyncFunction
+ * @return {Promise<any>}
+ */
+export function acquireLock({ name, exclusive = false }, asyncFunction) {
+  // If the browser supports the Web Locks API
+  // https://developer.mozilla.org/en-US/docs/Web/API/Web_Locks_API
+  if (navigator.locks) {
+    return navigator.locks.request(
+      name,
+      {
+        mode: exclusive ? 'exclusive' : 'shared',
+      },
+      asyncFunction
+    );
+  }
+  // Studio's supported browsers should support Web Locks but don't outright fail otherwise
+  return asyncFunction();
+}
diff --git a/contentcuration/contentcuration/frontend/shared/data/resources.js b/contentcuration/contentcuration/frontend/shared/data/resources.js
index 2575bfc3f9..fb1bdd10f6 100644
--- a/contentcuration/contentcuration/frontend/shared/data/resources.js
+++ b/contentcuration/contentcuration/frontend/shared/data/resources.js
@@ -1406,6 +1406,7 @@ export const ContentNode = new TreeResource({
               // so that we can avoid doing fetches while such changes
               // are pending.
               parent: parent.id,
+              oldParent: isCreate ? null : node.parent,
               oldObj: isCreate ? null : node,
               table: this.tableName,
               source: CLIENTID,
@@ -1546,6 +1547,12 @@ export const ContentNode = new TreeResource({
     return payload;
   },
 
+  /**
+   * Resolves with an array of all ancestors, including the node itself, in descending order
+   *
+   * @param {String} id
+   * @return {Promise<[{}]>}
+   */
   getAncestors(id) {
     return this.table.get(id).then(node => {
       if (node) {
@@ -1558,10 +1565,37 @@ export const ContentNode = new TreeResource({
         }
         return [node];
       }
+      // If node wasn't found, we fetch from the server
       return this.fetchCollection({ ancestors_of: id });
     });
   },
 
+  /**
+   * Calls `updateCallback` on each ancestor, and calls `.update` for that ancestor
+   * with the return value from `updateCallback`
+   *
+   * @param {String} id
+   * @param {Boolean} includeSelf
+   * @param {Boolean} ignoreChanges - Ignore generating change events for the updates
+   * @param {Function} updateCallback
+   * @return {Promise<void>}
+   */
+  updateAncestors({ id, includeSelf = false, ignoreChanges = false }, updateCallback) {
+    return this.transaction({ mode: 'rw' }, async () => {
+      const ancestors = await this.getAncestors(id);
+      for (const ancestor of ancestors) {
+        if (ancestor.id === id && !includeSelf) {
+          continue;
+        }
+        if (ignoreChanges) {
+          await this.table.update(ancestor.id, updateCallback(ancestor));
+        } else {
+          await this.update(ancestor.id, updateCallback(ancestor));
+        }
+      }
+    });
+  },
+
   /**
    * Uses local IndexedDB index on node_id+channel_id, otherwise specifically requests the
    * collection using the same params since GET detail endpoint doesn't support that the params
diff --git a/contentcuration/contentcuration/frontend/shared/data/serverSync.js b/contentcuration/contentcuration/frontend/shared/data/serverSync.js
index 27fb7b4cd0..100abf07f0 100644
--- a/contentcuration/contentcuration/frontend/shared/data/serverSync.js
+++ b/contentcuration/contentcuration/frontend/shared/data/serverSync.js
@@ -5,9 +5,10 @@ import pick from 'lodash/pick';
 import orderBy from 'lodash/orderBy';
 import uniq from 'lodash/uniq';
 import logging from '../logging';
-import applyChanges from './applyRemoteChanges';
+import { changeStream } from './applyRemoteChanges';
+import { acquireLock } from './locks';
 import { changeRevs } from './registry';
-import { CHANGE_TYPES, CHANGES_TABLE, MAX_REV_KEY } from './constants';
+import { CHANGE_TYPES, CHANGES_TABLE, MAX_REV_KEY, LOCK_NAMES } from './constants';
 import db, { channelScope } from './db';
 import { Channel, Session, Task } from './resources';
 import client from 'shared/client';
@@ -98,16 +99,6 @@ function handleAllowed(response) {
   return Promise.resolve();
 }
 
-function handleReturnedChanges(response) {
-  // The changes property is an array of any changes from the server to apply in the
-  // client.
-  const returnedChanges = get(response, ['data', 'changes'], []);
-  if (returnedChanges.length) {
-    return applyChanges(returnedChanges);
-  }
-  return Promise.resolve();
-}
-
 // These are keys that the changes table is indexed by, so we cannot modify these during
 // the modify call that we use to update the changes table, if they already exist.
 const noModifyKeys = {
@@ -202,7 +193,11 @@ function handleTasks(response) {
 
 const noUserError = 'No user logged in';
 
-async function syncChanges(syncAllChanges) {
+/**
+ * @param {boolean} syncAllChanges
+ * @return {Promise<[{}]>} - Resolves with an array of returned changes from the server
+ */
+function syncChanges(syncAllChanges) {
   // Note: we could in theory use Dexie syncable for what
   // we are doing here, but I can't find a good way to make
   // it ignore our regular API calls for seeding the database
@@ -212,82 +207,92 @@ async function syncChanges(syncAllChanges) {
   // revisions. We will do this for now, but we have the option of doing
   // something more involved and better architectured in the future.
 
-  try {
-    // Get the current user - if there is no user, we can't sync.
-    const user = await Session.getSession();
-    if (!user) {
-      // If not logged in, nothing to do.
-      throw new Error(noUserError);
-    }
+  // Either scoping to a channel or to a user
+  const syncLock = channelScope.id
+    ? LOCK_NAMES.SYNC_CHANNEL.replace('{channel_id}', channelScope.id)
+    : LOCK_NAMES.SYNC_USER;
 
-    const channel_revs = {};
-    if (channelScope.id) {
-      channel_revs[channelScope.id] = get(user, [MAX_REV_KEY, channelScope.id], 0);
-    }
+  // If we are syncing all changes, we don't need to acquire an exclusive lock because we should
+  // already have a global lock. Hopefully this could prevent the possibility of deadlocks.
+  return acquireLock({ name: syncLock, exclusive: !syncAllChanges }, async () => {
+    try {
+      // Get the current user - if there is no user, we can't sync.
+      const user = await Session.getSession();
+      if (!user) {
+        // If not logged in, nothing to do.
+        throw new Error(noUserError);
+      }
 
-    const unAppliedChanges = await db[CHANGES_TABLE].orderBy('server_rev')
-      .filter(c => c.synced && !c.errors && !c.disallowed)
-      .toArray();
+      const channel_revs = {};
+      if (channelScope.id) {
+        channel_revs[channelScope.id] = get(user, [MAX_REV_KEY, channelScope.id], 0);
+      }
 
-    const requestPayload = {
-      changes: [],
-      channel_revs,
-      user_rev: user.user_rev || 0,
-      unapplied_revs: unAppliedChanges.map(c => c.server_rev).filter(Boolean),
-    };
+      const unAppliedChanges = await db[CHANGES_TABLE].orderBy('server_rev')
+        .filter(c => c.synced && !c.errors && !c.disallowed)
+        .toArray();
 
-    // Snapshot which revs we are syncing, so that we can
-    // removes them from the changeRevs array after the sync
-    const revsToSync = [];
-    if (syncAllChanges) {
-      const unsyncedRevs = await db[CHANGES_TABLE].filter(c => !c.synced).primaryKeys();
-      revsToSync.push(...unsyncedRevs);
-    } else {
-      revsToSync.push(...changeRevs);
-    }
-    if (revsToSync.length) {
-      const syncableChanges = db[CHANGES_TABLE].where('rev')
-        .anyOf(revsToSync)
-        .filter(c => !c.synced);
-      const changesToSync = await syncableChanges.toArray();
-      // By the time we get here, our changesToSync Array should
-      // have every change we want to sync to the server, so we
-      // can now trim it down to only what is needed to transmit over the wire.
-      // TODO: remove moves when a delete change is present for an object,
-      // because a delete will wipe out the move.
-      const changes = changesToSync.map(trimChangeForSync).filter(Boolean);
-      // Create a promise for the sync - if there is nothing to sync just resolve immediately,
-      // in order to still call our change cleanup code.
-      if (changes.length) {
-        requestPayload.changes = changes;
+      const requestPayload = {
+        changes: [],
+        channel_revs,
+        user_rev: user.user_rev || 0,
+        unapplied_revs: unAppliedChanges.map(c => c.server_rev).filter(Boolean),
+      };
+
+      // Snapshot which revs we are syncing, so that we can
+      // removes them from the changeRevs array after the sync
+      const revsToSync = [];
+      if (syncAllChanges) {
+        const unsyncedRevs = await db[CHANGES_TABLE].filter(c => !c.synced).primaryKeys();
+        revsToSync.push(...unsyncedRevs);
+      } else {
+        revsToSync.push(...changeRevs);
+      }
+      if (revsToSync.length) {
+        const syncableChanges = db[CHANGES_TABLE].where('rev')
+          .anyOf(revsToSync)
+          .filter(c => !c.synced);
+        const changesToSync = await syncableChanges.toArray();
+        // By the time we get here, our changesToSync Array should
+        // have every change we want to sync to the server, so we
+        // can now trim it down to only what is needed to transmit over the wire.
+        // TODO: remove moves when a delete change is present for an object,
+        // because a delete will wipe out the move.
+        const changes = changesToSync.map(trimChangeForSync).filter(Boolean);
+        // Create a promise for the sync - if there is nothing to sync just resolve immediately,
+        // in order to still call our change cleanup code.
+        if (changes.length) {
+          requestPayload.changes = changes;
+        }
+      }
+      // The response from the sync endpoint has the format:
+      // {
+      //   "disallowed": [],
+      //   "allowed": [],
+      //   "changes": [],
+      //   "errors": [],
+      //   "successes": [],
+      // }
+      const response = await client.post(urls['sync'](), requestPayload);
+      // Clear out this many changes from changeRevs array, since we have now synced them.
+      changeRevs.splice(0, revsToSync.length);
+      await Promise.all([
+        handleDisallowed(response),
+        handleAllowed(response),
+        handleErrors(response),
+        handleSuccesses(response),
+        handleMaxRevs(response, user.id),
+        handleTasks(response),
+      ]);
+      // Return the array of returned changes
+      return get(response, ['data', 'changes'], []);
+    } catch (err) {
+      // There was an error during syncing, log, but carry on
+      if (err.message !== noUserError) {
+        logging.error(err);
       }
     }
-    // The response from the sync endpoint has the format:
-    // {
-    //   "disallowed": [],
-    //   "allowed": [],
-    //   "changes": [],
-    //   "errors": [],
-    //   "successes": [],
-    // }
-    const response = await client.post(urls['sync'](), requestPayload);
-    // Clear out this many changes from changeRevs array, since we have now synced them.
-    changeRevs.splice(0, revsToSync.length);
-    await Promise.all([
-      handleDisallowed(response),
-      handleAllowed(response),
-      handleReturnedChanges(response),
-      handleErrors(response),
-      handleSuccesses(response),
-      handleMaxRevs(response, user.id),
-      handleTasks(response),
-    ]);
-  } catch (err) {
-    // There was an error during syncing, log, but carry on
-    if (err.message !== noUserError) {
-      logging.error(err);
-    }
-  }
+  });
 }
 
 // Set the sync debounce time artificially low in tests to avoid timeouts.
@@ -302,13 +307,31 @@ function doSyncChanges(syncAll = false) {
   const deferredStack = syncDeferredStack.splice(0);
   // Wait for any existing sync to complete, then sync again.
   syncingPromise = syncingPromise
-    .then(() => syncChanges(syncAll))
-    .then(result => {
+    .then(() =>
+      acquireLock(
+        {
+          name: LOCK_NAMES.SYNC,
+          // If syncAll is true, we want to acquire an exclusive lock, which would make it globally
+          // blocking, otherwise we want to acquire a shared lock, which would allow other shared
+          // locks to be acquired and should not intersect with a global exclusive lock if one is
+          // already held.
+          exclusive: syncAll,
+        },
+        () => syncChanges(syncAll)
+      )
+    )
+    .then(returnedChanges => {
+      // Apply returned changes
+      if (returnedChanges.length) {
+        return changeStream.write(returnedChanges);
+      }
+    })
+    .then(() => {
       // If it is successful call all of the resolve functions that we have stored
       // from all the Promises that have been returned while this specific debounce
       // has been active.
       for (const { resolve } of deferredStack) {
-        resolve(result);
+        resolve();
       }
     })
     .catch(err => {
diff --git a/contentcuration/contentcuration/frontend/shared/utils/deferred.js b/contentcuration/contentcuration/frontend/shared/utils/deferred.js
new file mode 100644
index 0000000000..e94ef49dc5
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/utils/deferred.js
@@ -0,0 +1,67 @@
+/**
+ * Deferred promise
+ */
+export default class Deferred extends Promise {
+  /**
+   * @param {function(resolve, reject): void|null} executor
+   */
+  constructor(executor = null) {
+    let self_resolve, self_reject;
+    executor = executor || (() => {});
+
+    super(function(resolve, reject) {
+      self_resolve = resolve;
+      self_reject = reject;
+      executor(resolve, reject);
+    });
+
+    this._resolve = self_resolve;
+    this._reject = self_reject;
+
+    this.isResolved = false;
+    this.isRejected = false;
+  }
+
+  get isFulfilled() {
+    return this.isResolved || this.isRejected;
+  }
+
+  /**
+   * @param value
+   * @returns {Deferred}
+   */
+  resolve(value) {
+    this._resolve(value);
+    this.isResolved = true;
+    return this;
+  }
+
+  /**
+   * @param value
+   * @returns {Deferred}
+   */
+  reject(value) {
+    this._reject(value);
+    this.isRejected = true;
+    return this;
+  }
+
+  /**
+   * @returns {Promise}
+   */
+  promise() {
+    return new Promise((resolve, reject) => {
+      this.then(resolve, reject);
+    });
+  }
+
+  /**
+   * @param {Promise} promise
+   * @return {Deferred}
+   */
+  static fromPromise(promise) {
+    const deferred = new Deferred();
+    promise.then(deferred.resolve.bind(deferred), deferred.reject.bind(deferred));
+    return deferred;
+  }
+}
diff --git a/jest_config/jest.conf.js b/jest_config/jest.conf.js
index ff89cf2c24..88a490ebb2 100644
--- a/jest_config/jest.conf.js
+++ b/jest_config/jest.conf.js
@@ -27,7 +27,7 @@ module.exports = {
   },
   transformIgnorePatterns: ['/node_modules/(?!vuetify|epubjs|kolibri-design-system|kolibri-constants|axios)'],
   snapshotSerializers: ['<rootDir>/node_modules/jest-serializer-vue'],
-  setupFilesAfterEnv: [path.resolve(__dirname, './setup')],
+  setupFilesAfterEnv: ['<rootDir>/jest_config/setup.js'],
   coverageDirectory: '<rootDir>/coverage',
   collectCoverageFrom: ['!**/node_modules/**'],
   verbose: false,
diff --git a/jest_config/setup.js b/jest_config/setup.js
index c96391f83f..d5fb127156 100644
--- a/jest_config/setup.js
+++ b/jest_config/setup.js
@@ -9,7 +9,16 @@ import KThemePlugin from 'kolibri-design-system/lib/KThemePlugin';
 import 'shared/i18n/setup';
 // Polyfill indexeddb
 import 'fake-indexeddb/auto';
+// Ponyfill webstreams
+import {ReadableStream, WritableStream, TransformStream, CountQueuingStrategy} from 'web-streams-polyfill/ponyfill/es2018';
 import jquery from 'jquery';
+
+window.jQuery = window.$ = jquery;
+window.ReadableStream = global.ReadableStream = ReadableStream;
+window.WritableStream = global.WritableStream = WritableStream;
+window.TransformStream = global.TransformStream = TransformStream;
+window.CountQueuingStrategy = global.CountQueuingStrategy = CountQueuingStrategy;
+
 import AnalyticsPlugin from 'shared/analytics/plugin';
 import { setupSchema } from 'shared/data';
 import * as resources from 'shared/data/resources';
@@ -34,8 +43,6 @@ global.afterEach(() => {
   });
 });
 
-window.jQuery = window.$ = jquery;
-
 window.storageBaseUrl = '/content/storage/';
 
 Vue.use(VueRouter);
diff --git a/package.json b/package.json
index d19c7173cc..74794499f6 100644
--- a/package.json
+++ b/package.json
@@ -116,6 +116,7 @@
     "npm-run-all": "^4.1.3",
     "stylus": "^0.59.0",
     "stylus-loader": "^7.1.2",
+    "web-streams-polyfill": "^3.2.1",
     "workbox-webpack-plugin": "^6.5.4"
   },
   "false": {},

From 07d3af922466d666da1ccbabcf2a86a85ef3f969 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Tue, 6 Jun 2023 13:44:19 -0700
Subject: [PATCH 08/63] Fix duplicate coach content icon for resources

---
 .../channelEdit/components/ContentNodeListItem/index.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue
index 6ca94fa902..ba6d555b85 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue
@@ -97,7 +97,7 @@
                     >
                       {{ category(node.categories) }}
                     </span>
-                    <span v-if="(isTopic && node.coach_count) || isCoach">
+                    <span v-if="isTopic && node.coach_count">
                       <!-- for each learning activity -->
                       <VTooltip bottom lazy>
                         <template #activator="{ on }">

From 1f543533a1a35b1457113e3e1ce2fbc7a1addc98 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Tue, 6 Jun 2023 14:04:09 -0700
Subject: [PATCH 09/63] Fix affected tests for aggregate counts

---
 .../vuex/contentNode/__tests__/actions.spec.js     | 14 +++++++++++++-
 .../frontend/shared/data/__tests__/changes.spec.js | 12 +++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/actions.spec.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/actions.spec.js
index a133156e3d..8f0767beeb 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/actions.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/__tests__/actions.spec.js
@@ -15,7 +15,15 @@ const parentId = '000000000000000000000000000000000000';
 describe('contentNode actions', () => {
   let store;
   let id;
-  const contentNodeDatum = { title: 'test', parent: parentId, lft: 1, tags: {} };
+  const contentNodeDatum = {
+    title: 'test',
+    parent: parentId,
+    lft: 1,
+    tags: {},
+    total_count: 0,
+    resource_count: 0,
+    coach_count: 0,
+  };
   beforeEach(async () => {
     await mockChannelScope('test-123');
     return ContentNode._add(contentNodeDatum).then(newId => {
@@ -65,6 +73,8 @@ describe('contentNode actions', () => {
         expect(Object.values(store.state.contentNode.contentNodesMap)).toEqual([
           {
             ...contentNodeDatum,
+            resource_count: 1,
+            total_count: 1,
           },
         ]);
       });
@@ -84,6 +94,8 @@ describe('contentNode actions', () => {
           thumbnail_encoding: {},
           ...contentNodeDatum,
           tags: [],
+          resource_count: 1,
+          total_count: 1,
         });
       });
     });
diff --git a/contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js b/contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js
index dfea978a94..82cde0fc7d 100644
--- a/contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js
@@ -188,6 +188,7 @@ describe('Change Types', () => {
       target: '2',
       position: RELATIVE_TREE_POSITIONS.LAST_CHILD,
       parent: '3',
+      oldParent: '4',
       source: CLIENTID,
     });
     const rev = await change.saveChange();
@@ -195,7 +196,16 @@ describe('Change Types', () => {
     expect(persistedChange).toEqual({
       rev,
       channel_id,
-      ...pick(change, ['type', 'key', 'table', 'target', 'position', 'parent', 'source']),
+      ...pick(change, [
+        'type',
+        'key',
+        'table',
+        'target',
+        'position',
+        'parent',
+        'source',
+        'oldParent',
+      ]),
     });
   });
 

From 2cbb3f962826eb96d84a05781ea92ab69ca5001e Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Tue, 13 Jun 2023 11:34:46 -0700
Subject: [PATCH 10/63] Keep applying remote changes in the same lock as sync
 for now

---
 .../shared/data/applyRemoteChanges.js         | 17 +++++++----------
 .../frontend/shared/data/serverSync.js        | 19 +++++++++++--------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js b/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js
index c30741ac77..109ab86f13 100644
--- a/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js
+++ b/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js
@@ -1,10 +1,9 @@
 import Dexie from 'dexie';
 import sortBy from 'lodash/sortBy';
 import logging from '../logging';
-import { CHANGE_TYPES, TABLE_NAMES, LOCK_NAMES } from './constants';
+import { CHANGE_TYPES, TABLE_NAMES } from './constants';
 import db from './db';
 import { INDEXEDDB_RESOURCES } from './registry';
-import { acquireLock } from 'shared/data/locks';
 import { RolesNames } from 'shared/leUtils/Roles';
 import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 
@@ -358,14 +357,12 @@ export class ChangeStream {
       this.init();
     }
 
-    return acquireLock({ name: LOCK_NAMES.APPLY_CHANGES }, async () => {
-      for (const change of sortChanges(changes)) {
-        // write to the queue but not necessarily applied yet
-        this._writer.write(change);
-      }
-      // return/await here ensures all changes are applied, which allows us to release the lock
-      return this._writer.ready;
-    });
+    for (const change of sortChanges(changes)) {
+      // write to the queue but not necessarily applied yet
+      this._writer.write(change);
+    }
+    // return/await here ensures all changes are applied
+    return this._writer.ready;
   }
 
   /**
diff --git a/contentcuration/contentcuration/frontend/shared/data/serverSync.js b/contentcuration/contentcuration/frontend/shared/data/serverSync.js
index 100abf07f0..0c4864df79 100644
--- a/contentcuration/contentcuration/frontend/shared/data/serverSync.js
+++ b/contentcuration/contentcuration/frontend/shared/data/serverSync.js
@@ -99,6 +99,16 @@ function handleAllowed(response) {
   return Promise.resolve();
 }
 
+function handleReturnedChanges(response) {
+  // The changes property is an array of any changes from the server to apply in the
+  // client.
+  const returnedChanges = get(response, ['data', 'changes'], []);
+  if (returnedChanges.length) {
+    return changeStream.write(returnedChanges);
+  }
+  return Promise.resolve();
+}
+
 // These are keys that the changes table is indexed by, so we cannot modify these during
 // the modify call that we use to update the changes table, if they already exist.
 const noModifyKeys = {
@@ -279,13 +289,12 @@ function syncChanges(syncAllChanges) {
       await Promise.all([
         handleDisallowed(response),
         handleAllowed(response),
+        handleReturnedChanges(response),
         handleErrors(response),
         handleSuccesses(response),
         handleMaxRevs(response, user.id),
         handleTasks(response),
       ]);
-      // Return the array of returned changes
-      return get(response, ['data', 'changes'], []);
     } catch (err) {
       // There was an error during syncing, log, but carry on
       if (err.message !== noUserError) {
@@ -320,12 +329,6 @@ function doSyncChanges(syncAll = false) {
         () => syncChanges(syncAll)
       )
     )
-    .then(returnedChanges => {
-      // Apply returned changes
-      if (returnedChanges.length) {
-        return changeStream.write(returnedChanges);
-      }
-    })
     .then(() => {
       // If it is successful call all of the resolve functions that we have stored
       // from all the Promises that have been returned while this specific debounce

From fd90b2671f7fa988a1bf2d5be428ed481da28663 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Tue, 13 Jun 2023 14:26:50 -0700
Subject: [PATCH 11/63] Track client support for web locks API

---
 .../contentcuration/frontend/shared/data/locks.js            | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/contentcuration/contentcuration/frontend/shared/data/locks.js b/contentcuration/contentcuration/frontend/shared/data/locks.js
index d6963e88d2..28ff189eb1 100644
--- a/contentcuration/contentcuration/frontend/shared/data/locks.js
+++ b/contentcuration/contentcuration/frontend/shared/data/locks.js
@@ -1,3 +1,5 @@
+import logging from 'shared/logging';
+
 /**
  * Acquire an exclusive lock on the given name using the browser's Web Locks API,
  * and then run the given async function.
@@ -18,6 +20,9 @@ export function acquireLock({ name, exclusive = false }, asyncFunction) {
       },
       asyncFunction
     );
+  } else {
+    // Track if clients aren't supporting the Web Locks API
+    logging.error(new Error('Web Locks API not supported by browser'));
   }
   // Studio's supported browsers should support Web Locks but don't outright fail otherwise
   return asyncFunction();

From 49aa5b00358d0a66cf196b7052808080d933a3c6 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Tue, 13 Jun 2023 16:38:17 -0700
Subject: [PATCH 12/63] Add cleanup behaviour for global subscriptions.

---
 .../frontend/shared/__tests__/app.spec.js         | 15 ++++++++++-----
 .../contentcuration/frontend/shared/app.js        | 13 ++++++++++++-
 .../shared/vuex/syncProgressPlugin/index.js       |  1 +
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/shared/__tests__/app.spec.js b/contentcuration/contentcuration/frontend/shared/__tests__/app.spec.js
index bf5625df7c..2a95b653f1 100644
--- a/contentcuration/contentcuration/frontend/shared/__tests__/app.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/__tests__/app.spec.js
@@ -15,6 +15,7 @@ const USER_2 = { id: 1 };
 
 describe('startApp', () => {
   let store;
+  let cleanup;
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -24,6 +25,10 @@ describe('startApp', () => {
   afterEach(async () => {
     global.user = undefined;
     await Session.table.clear();
+    if (cleanup) {
+      cleanup();
+    }
+    cleanup = undefined;
   });
 
   describe('for a guest', () => {
@@ -38,7 +43,7 @@ describe('startApp', () => {
       });
 
       it("the client database shouldn't be reset", async () => {
-        await startApp({ router, store });
+        cleanup = await startApp({ router, store });
         expect(resetDB).not.toHaveBeenCalled();
       });
     });
@@ -52,7 +57,7 @@ describe('startApp', () => {
       });
 
       it('the client database should be reset', async () => {
-        await startApp({ router, store });
+        cleanup = await startApp({ router, store });
         expect(resetDB).toHaveBeenCalledTimes(1);
       });
     });
@@ -70,7 +75,7 @@ describe('startApp', () => {
       });
 
       it("the client database shouldn't be reset", async () => {
-        await startApp({ router, store });
+        cleanup = await startApp({ router, store });
         expect(resetDB).not.toHaveBeenCalled();
       });
     });
@@ -84,7 +89,7 @@ describe('startApp', () => {
       });
 
       it("the client database shouldn't be reset", async () => {
-        await startApp({ router, store });
+        cleanup = await startApp({ router, store });
         expect(resetDB).not.toHaveBeenCalled();
       });
     });
@@ -98,7 +103,7 @@ describe('startApp', () => {
       });
 
       it('the client database should be reset', async () => {
-        await startApp({ router, store });
+        cleanup = await startApp({ router, store });
         expect(resetDB).toHaveBeenCalledTimes(1);
       });
     });
diff --git a/contentcuration/contentcuration/frontend/shared/app.js b/contentcuration/contentcuration/frontend/shared/app.js
index 582044ff67..1285ca6c07 100644
--- a/contentcuration/contentcuration/frontend/shared/app.js
+++ b/contentcuration/contentcuration/frontend/shared/app.js
@@ -317,6 +317,9 @@ export default async function startApp({ store, router, index }) {
   ) {
     await resetDB();
   }
+
+  let subscription;
+
   if (currentUser.id !== undefined && currentUser.id !== null) {
     // The user is logged on, so persist that to the session table in indexeddb
     await store.dispatch('saveSession', currentUser, { root: true });
@@ -325,7 +328,7 @@ export default async function startApp({ store, router, index }) {
       return Session.table.toCollection().first(Boolean);
     });
 
-    const subscription = observable.subscribe({
+    subscription = observable.subscribe({
       next(result) {
         if (!result && !window.location.pathname.endsWith(urls.accounts())) {
           window.location = urls.accounts();
@@ -372,4 +375,12 @@ export default async function startApp({ store, router, index }) {
   store.listenForIndexedDBChanges();
 
   rootVue = new Vue(config);
+
+  // Return a cleanup function
+  return function() {
+    if (subscription) {
+      subscription.unsubscribe();
+    }
+    store.stopListeningForIndexedDBChanges();
+  };
 }
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/syncProgressPlugin/index.js b/contentcuration/contentcuration/frontend/shared/vuex/syncProgressPlugin/index.js
index 07811b8666..0943920c24 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/syncProgressPlugin/index.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/syncProgressPlugin/index.js
@@ -21,6 +21,7 @@ const SyncProgressPlugin = store => {
         subscription.unsubscribe();
       },
     });
+    store.stopListeningForIndexedDBChanges = subscription.unsubscribe;
   };
 };
 

From 23ae2528b77a90d4e378334fd530ed8277917a31 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Tue, 13 Jun 2023 16:43:34 -0700
Subject: [PATCH 13/63] Only show saving indicator when not offline.

---
 .../frontend/channelEdit/views/TreeView/TreeViewBase.vue   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
index d9e49ca59b..5566b290a0 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
@@ -55,7 +55,7 @@
         </router-link>
       </VToolbarItems>
       <VSpacer />
-      <SavingIndicator />
+      <SavingIndicator v-if="!offline" />
       <OfflineText indicator />
       <ProgressModal />
       <div
@@ -306,7 +306,7 @@
 
 <script>
 
-  import { mapActions, mapGetters } from 'vuex';
+  import { mapActions, mapGetters, mapState } from 'vuex';
   import Clipboard from '../../components/Clipboard';
   import SyncResourcesModal from '../sync/SyncResourcesModal';
   import ProgressModal from '../progress/ProgressModal';
@@ -363,6 +363,9 @@
       };
     },
     computed: {
+      ...mapState({
+        offline: state => !state.connection.online,
+      }),
       ...mapGetters('contentNode', ['getContentNode']),
       ...mapGetters('currentChannel', ['currentChannel', 'canEdit', 'canManage', 'rootId']),
       rootNode() {

From 38d87330b895b3e2c319b0825eb21e8abe2971fe Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Wed, 14 Jun 2023 15:11:40 -0700
Subject: [PATCH 14/63] Add regression test and fix for double JSONed options.

---
 .../contentcuration/tests/test_exportchannel.py           | 8 ++++++++
 contentcuration/contentcuration/utils/publish.py          | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/tests/test_exportchannel.py b/contentcuration/contentcuration/tests/test_exportchannel.py
index 8eeeb064ec..8e629a1379 100644
--- a/contentcuration/contentcuration/tests/test_exportchannel.py
+++ b/contentcuration/contentcuration/tests/test_exportchannel.py
@@ -263,6 +263,14 @@ def test_duration_override_on_completion_criteria_time(self):
         assert completion_criteria_node.duration == 20
         assert non_completion_criteria_node.duration == 100
 
+    def test_completion_criteria_set(self):
+        completion_criteria_node = kolibri_models.ContentNode.objects.filter(title='Completion criteria test').first()
+
+        self.assertEqual(completion_criteria_node.options["completion_criteria"], {
+            "model": "time",
+            "threshold": 20
+        })
+
     def test_contentnode_channel_id_data(self):
         channel = kolibri_models.ChannelMetadata.objects.first()
         nodes = kolibri_models.ContentNode.objects.all()
diff --git a/contentcuration/contentcuration/utils/publish.py b/contentcuration/contentcuration/utils/publish.py
index 1593fda172..b0e9bab857 100644
--- a/contentcuration/contentcuration/utils/publish.py
+++ b/contentcuration/contentcuration/utils/publish.py
@@ -349,7 +349,7 @@ def create_bare_contentnode(ccnode, default_language, channel_id, channel_name,
             'license_description': kolibri_license.license_description if kolibri_license is not None else None,
             'coach_content': ccnode.role_visibility == roles.COACH,
             'duration': duration,
-            'options': json.dumps(options),
+            'options': options,
             # Fields for metadata labels
             "grade_levels": ",".join(grade_levels.keys()) if grade_levels else None,
             "resource_types": ",".join(resource_types.keys()) if resource_types else None,

From 4af8e7db0e07d88c5fc1d814dbe6153c59a4efe5 Mon Sep 17 00:00:00 2001
From: Samson Akol <akolson2010@gmail.com>
Date: Fri, 16 Jun 2023 22:44:09 +0300
Subject: [PATCH 15/63] Fixes error that appears in the console on drag nested
 resource to to its root

---
 .../channelEdit/views/CurrentTopicView.vue    | 94 ++++++++++++++-----
 1 file changed, 70 insertions(+), 24 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
index 24505beedd..d953290801 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
@@ -1,14 +1,33 @@
 <template>
 
-  <VContainer v-resize="handleWindowResize" fluid class="ma-0 main pa-0 panel">
+  <VContainer
+    v-resize="handleWindowResize"
+    fluid
+    class="ma-0 main pa-0 panel"
+  >
     <!-- Breadcrumbs -->
-    <VToolbar dense color="transparent" flat>
+    <VToolbar
+      dense
+      color="transparent"
+      flat
+    >
       <slot name="action"></slot>
-      <Breadcrumbs :items="ancestors" class="mx-1 px-2 py-0">
+      <Breadcrumbs
+        :items="ancestors"
+        class="mx-1 px-2 py-0"
+      >
         <template #item="{ item, isLast }">
           <!-- Current item -->
-          <VLayout v-if="isLast" align-center row>
-            <VFlex class="font-weight-bold text-truncate" shrink :class="getTitleClass(item)">
+          <VLayout
+            v-if="isLast"
+            align-center
+            row
+          >
+            <VFlex
+              class="font-weight-bold text-truncate"
+              shrink
+              :class="getTitleClass(item)"
+            >
               {{ getTitle(item) }}
             </VFlex>
             <Menu v-if="item.displayNodeOptions">
@@ -19,10 +38,17 @@
                   v-on="on"
                 />
               </template>
-              <ContentNodeOptions v-if="node" :nodeId="topicId" />
+              <ContentNodeOptions
+                v-if="node"
+                :nodeId="topicId"
+              />
             </Menu>
           </VLayout>
-          <span v-else class="grey--text" :class="getTitleClass(item)">
+          <span
+            v-else
+            class="grey--text"
+            :class="getTitleClass(item)"
+          >
             {{ getTitle(item) }}
           </span>
         </template>
@@ -30,7 +56,11 @@
     </VToolbar>
 
     <!-- Topic actions -->
-    <ToolBar dense :flat="!elevated" style="z-index: 4;">
+    <ToolBar
+      dense
+      :flat="!elevated"
+      style="z-index: 4;"
+    >
       <div class="mx-3">
         <Checkbox
           v-if="node && node.total_count"
@@ -88,7 +118,11 @@
       <VSpacer />
 
       <VFadeTransition>
-        <div v-show="selected.length" v-if="$vuetify.breakpoint.mdAndUp" class="px-1">
+        <div
+          v-show="selected.length"
+          v-if="$vuetify.breakpoint.mdAndUp"
+          class="px-1"
+        >
           {{ selectionText }}
         </div>
       </VFadeTransition>
@@ -120,7 +154,12 @@
 
         <Menu v-if="canEdit">
           <template #activator="{ on }">
-            <VBtn color="primary" class="ml-2" style="height: 32px;" v-on="on">
+            <VBtn
+              color="primary"
+              class="ml-2"
+              style="height: 32px;"
+              v-on="on"
+            >
               {{ $tr('addButton') }}
               <Icon small>
                 arrow_drop_down
@@ -188,7 +227,10 @@
         @resize="handleResourceDrawerResize"
         @scroll="scroll"
       >
-        <template v-if="canEdit" #actions>
+        <template
+          v-if="canEdit"
+          #actions
+        >
           <IconButton
             size="small"
             icon="edit"
@@ -212,7 +254,10 @@
             />
           </Menu>
         </template>
-        <template v-else #actions>
+        <template
+          v-else
+          #actions
+        >
           <IconButton
             size="small"
             icon="clipboard"
@@ -538,7 +583,8 @@
         }
 
         // All sources should be from the same region
-        const sourceRegion = drop.sources[0].region;
+        const sources = drop.sources || [];
+        const sourceRegion = sources.length > 0 ? sources[0].region : null;
         const payload = {
           target: identity.metadata.id,
           position,
@@ -713,16 +759,16 @@
 </script>
 
 <style scoped>
-  .main {
-    background-color: white;
-  }
-  .panel {
-    height: inherit;
-    overflow-y: auto;
-  }
+.main {
+  background-color: white;
+}
+.panel {
+  height: inherit;
+  overflow-y: auto;
+}
 
-  .fade-transition-enter-active,
-  .fade-transition-leave-active {
-    transition-duration: 0.1s
-  }
+.fade-transition-enter-active,
+.fade-transition-leave-active {
+  transition-duration: 0.1s;
+}
 </style>

From 0ac48fd9864376fb22be86534baa1ce75d201d38 Mon Sep 17 00:00:00 2001
From: Samson Akol <akolson2010@gmail.com>
Date: Fri, 16 Jun 2023 23:11:40 +0300
Subject: [PATCH 16/63] Fixes error that appears in the console on drag nested
 resource to to its root

---
 .../channelEdit/views/CurrentTopicView.vue    | 91 +++++--------------
 1 file changed, 23 insertions(+), 68 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
index d953290801..8417a88140 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
@@ -1,33 +1,14 @@
 <template>
 
-  <VContainer
-    v-resize="handleWindowResize"
-    fluid
-    class="ma-0 main pa-0 panel"
-  >
+  <VContainer v-resize="handleWindowResize" fluid class="ma-0 main pa-0 panel">
     <!-- Breadcrumbs -->
-    <VToolbar
-      dense
-      color="transparent"
-      flat
-    >
+    <VToolbar dense color="transparent" flat>
       <slot name="action"></slot>
-      <Breadcrumbs
-        :items="ancestors"
-        class="mx-1 px-2 py-0"
-      >
+      <Breadcrumbs :items="ancestors" class="mx-1 px-2 py-0">
         <template #item="{ item, isLast }">
           <!-- Current item -->
-          <VLayout
-            v-if="isLast"
-            align-center
-            row
-          >
-            <VFlex
-              class="font-weight-bold text-truncate"
-              shrink
-              :class="getTitleClass(item)"
-            >
+          <VLayout v-if="isLast" align-center row>
+            <VFlex class="font-weight-bold text-truncate" shrink :class="getTitleClass(item)">
               {{ getTitle(item) }}
             </VFlex>
             <Menu v-if="item.displayNodeOptions">
@@ -38,17 +19,10 @@
                   v-on="on"
                 />
               </template>
-              <ContentNodeOptions
-                v-if="node"
-                :nodeId="topicId"
-              />
+              <ContentNodeOptions v-if="node" :nodeId="topicId" />
             </Menu>
           </VLayout>
-          <span
-            v-else
-            class="grey--text"
-            :class="getTitleClass(item)"
-          >
+          <span v-else class="grey--text" :class="getTitleClass(item)">
             {{ getTitle(item) }}
           </span>
         </template>
@@ -56,11 +30,7 @@
     </VToolbar>
 
     <!-- Topic actions -->
-    <ToolBar
-      dense
-      :flat="!elevated"
-      style="z-index: 4;"
-    >
+    <ToolBar dense :flat="!elevated" style="z-index: 4;">
       <div class="mx-3">
         <Checkbox
           v-if="node && node.total_count"
@@ -118,11 +88,7 @@
       <VSpacer />
 
       <VFadeTransition>
-        <div
-          v-show="selected.length"
-          v-if="$vuetify.breakpoint.mdAndUp"
-          class="px-1"
-        >
+        <div v-show="selected.length" v-if="$vuetify.breakpoint.mdAndUp" class="px-1">
           {{ selectionText }}
         </div>
       </VFadeTransition>
@@ -154,12 +120,7 @@
 
         <Menu v-if="canEdit">
           <template #activator="{ on }">
-            <VBtn
-              color="primary"
-              class="ml-2"
-              style="height: 32px;"
-              v-on="on"
-            >
+            <VBtn color="primary" class="ml-2" style="height: 32px;" v-on="on">
               {{ $tr('addButton') }}
               <Icon small>
                 arrow_drop_down
@@ -227,10 +188,7 @@
         @resize="handleResourceDrawerResize"
         @scroll="scroll"
       >
-        <template
-          v-if="canEdit"
-          #actions
-        >
+        <template v-if="canEdit" #actions>
           <IconButton
             size="small"
             icon="edit"
@@ -254,10 +212,7 @@
             />
           </Menu>
         </template>
-        <template
-          v-else
-          #actions
-        >
+        <template v-else #actions>
           <IconButton
             size="small"
             icon="clipboard"
@@ -759,16 +714,16 @@
 </script>
 
 <style scoped>
-.main {
-  background-color: white;
-}
-.panel {
-  height: inherit;
-  overflow-y: auto;
-}
+  .main {
+      background-color: white;
+  }
+  .panel {
+      height: inherit;
+      overflow-y: auto;
+  }
 
-.fade-transition-enter-active,
-.fade-transition-leave-active {
-  transition-duration: 0.1s;
-}
+  .fade-transition-enter-active,
+  .fade-transition-leave-active {
+      transition-duration: 0.1s;
+  }
 </style>

From 4f9fc4348f866568cf78e8bb2dbdb71d5041f719 Mon Sep 17 00:00:00 2001
From: Samson Akol <akolson2010@gmail.com>
Date: Fri, 16 Jun 2023 23:14:24 +0300
Subject: [PATCH 17/63] Fixes css styling

---
 .../frontend/channelEdit/views/CurrentTopicView.vue       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
index 8417a88140..cbf4f730fa 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
@@ -715,15 +715,15 @@
 
 <style scoped>
   .main {
-      background-color: white;
+    background-color: white;
   }
   .panel {
-      height: inherit;
-      overflow-y: auto;
+    height: inherit;
+    overflow-y: auto;
   }
 
   .fade-transition-enter-active,
   .fade-transition-leave-active {
-      transition-duration: 0.1s;
+    transition-duration: 0.1s;
   }
 </style>

From 56af7d22f244c306e975942bb8df2d43693c9c16 Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Mon, 19 Jun 2023 10:06:23 -0500
Subject: [PATCH 18/63] Fixes incorrect folder order/layout for folders with
 long titles

---
 .../frontend/shared/views/Breadcrumbs.vue                | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/shared/views/Breadcrumbs.vue b/contentcuration/contentcuration/frontend/shared/views/Breadcrumbs.vue
index c03f45657c..113659744d 100644
--- a/contentcuration/contentcuration/frontend/shared/views/Breadcrumbs.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/Breadcrumbs.vue
@@ -25,7 +25,7 @@
           <VList v-for="(item, i) in collapsedItems" :key="`collapsed-${i}`">
             <VListTile :to="item.to">
               <VListTileTitle>
-                <slot name="item" :item="item" :index="i" :isLast="false"></slot>
+                <slot name="item" :item="item" :index="i" :isLast="false" :isFirst="items[0].id === item.id"></slot>
               </VListTileTitle>
             </VListTile>
           </VList>
@@ -47,7 +47,7 @@
         name="item"
         :item="item"
         :index="index"
-        :isFirst="index === 0"
+        :isFirst="items[0].id === item.id"
         :isLast="index === breadcrumbs.length - 1"
       ></slot>
     </VBreadcrumbsItem>
@@ -112,12 +112,13 @@
 
 </script>
 
-<style scoped>
+<style lang="less" scoped>
   /* Truncate text if the last item is too long */
   .breadcrumb:last-child {
     max-width: calc(100% - 76px);
   }
   /deep/ .v-breadcrumbs__item {
-    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 </style>

From 8478e0cb91b4ea8c1d278b20be38162e2b05e775 Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Mon, 19 Jun 2023 10:21:39 -0500
Subject: [PATCH 19/63] Linting fixes

---
 .../frontend/shared/views/Breadcrumbs.vue            | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/shared/views/Breadcrumbs.vue b/contentcuration/contentcuration/frontend/shared/views/Breadcrumbs.vue
index 113659744d..e016de0bb4 100644
--- a/contentcuration/contentcuration/frontend/shared/views/Breadcrumbs.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/Breadcrumbs.vue
@@ -25,7 +25,14 @@
           <VList v-for="(item, i) in collapsedItems" :key="`collapsed-${i}`">
             <VListTile :to="item.to">
               <VListTileTitle>
-                <slot name="item" :item="item" :index="i" :isLast="false" :isFirst="items[0].id === item.id"></slot>
+                <slot 
+                  name="item" 
+                  :item="item" 
+                  :index="i" 
+                  :isLast="false" 
+                  :isFirst="items[0].id === item.id"
+                >
+                </slot>
               </VListTileTitle>
             </VListTile>
           </VList>
@@ -113,12 +120,15 @@
 </script>
 
 <style lang="less" scoped>
+
   /* Truncate text if the last item is too long */
   .breadcrumb:last-child {
     max-width: calc(100% - 76px);
   }
+
   /deep/ .v-breadcrumbs__item {
     overflow: hidden;
     text-overflow: ellipsis;
   }
+
 </style>

From 2ecd7c643dff96f2f40ac12c1850aa9ef3e0461f Mon Sep 17 00:00:00 2001
From: Samson Akol <akolson2010@gmail.com>
Date: Fri, 16 Jun 2023 20:44:16 +0300
Subject: [PATCH 20/63] Streamlines use of oldObj.parent

---
 .../__tests__/ContentNodeResource.spec.js     |  6 +++---
 .../shared/data/__tests__/changes.spec.js     | 20 +++++++++----------
 .../shared/data/applyRemoteChanges.js         |  4 ++--
 .../frontend/shared/data/changes.js           |  4 ++--
 .../frontend/shared/data/resources.js         |  1 -
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js b/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js
index a7f58f81c2..514986558f 100644
--- a/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js
@@ -540,7 +540,7 @@ describe('ContentNode methods', () => {
 
   describe('tableMove method', () => {
     let node,
-      oldParent,
+      oldObj,
       parent,
       payload,
       change,
@@ -553,9 +553,9 @@ describe('ContentNode methods', () => {
         put: jest.fn(() => Promise.resolve()),
       };
       updated = true;
-      oldParent = { id: uuid4(), title: 'Parent' };
+      oldObj = { id: uuid4(), title: 'Parent' };
       parent = { id: uuid4(), root_id: uuid4(), title: 'Parent' };
-      node = { id: uuid4(), parent: oldParent.id, title: 'Source node' };
+      node = { id: uuid4(), parent: oldObj.id, title: 'Source node' };
       payload = { id: uuid4(), parent: parent.id, changed: true, lft: 1, title: 'Payload' };
       change = {
         key: payload.id,
diff --git a/contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js b/contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js
index 82cde0fc7d..13c4759263 100644
--- a/contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js
@@ -182,30 +182,22 @@ describe('Change Types', () => {
   });
 
   it('should persist only the specified fields in the MovedChange', async () => {
+    const oldObj = { parent: '4' };
     const change = new MovedChange({
       key: '1',
       table: TABLE_NAMES.CONTENTNODE,
       target: '2',
       position: RELATIVE_TREE_POSITIONS.LAST_CHILD,
       parent: '3',
-      oldParent: '4',
       source: CLIENTID,
+      oldObj,
     });
     const rev = await change.saveChange();
     const persistedChange = await db[CHANGES_TABLE].get(rev);
     expect(persistedChange).toEqual({
       rev,
       channel_id,
-      ...pick(change, [
-        'type',
-        'key',
-        'table',
-        'target',
-        'position',
-        'parent',
-        'source',
-        'oldParent',
-      ]),
+      ...pick(change, ['type', 'key', 'table', 'target', 'position', 'parent', 'source', 'oldObj']),
     });
   });
 
@@ -427,6 +419,7 @@ describe('Change Types Unhappy Paths', () => {
 
   // MovedChange
   it('should throw error when MovedChange is instantiated without target', () => {
+    const oldObj = { a: 1, b: 2 };
     expect(
       () =>
         new MovedChange({
@@ -434,11 +427,13 @@ describe('Change Types Unhappy Paths', () => {
           table: TABLE_NAMES.CONTENTNODE,
           position: RELATIVE_TREE_POSITIONS.LAST_CHILD,
           source: CLIENTID,
+          oldObj,
         })
     ).toThrow(new TypeError('target is required for a MovedChange but it was undefined'));
   });
 
   it('should throw error when MovedChange is instantiated with incorrect position type', () => {
+    const oldObj = { a: 1, b: { c: 1 } };
     expect(
       () =>
         new MovedChange({
@@ -447,11 +442,13 @@ describe('Change Types Unhappy Paths', () => {
           target: '2',
           position: 'invalid',
           source: CLIENTID,
+          oldObj,
         })
     ).toThrow(new ReferenceError('invalid is not a valid position value'));
   });
 
   it('should throw error when MovedChange is instantiated without parent', () => {
+    const oldObj = { a: 1, b: 2, parent: 3 };
     expect(
       () =>
         new MovedChange({
@@ -460,6 +457,7 @@ describe('Change Types Unhappy Paths', () => {
           target: '2',
           position: RELATIVE_TREE_POSITIONS.LAST_CHILD,
           source: CLIENTID,
+          oldObj,
         })
     ).toThrow(new ReferenceError('parent is required for a MovedChange but it was undefined'));
   });
diff --git a/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js b/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js
index 109ab86f13..bed39ce5b1 100644
--- a/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js
+++ b/contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js
@@ -295,13 +295,13 @@ class ResourceCounts extends ChangeDispatcher {
    */
   async applyMove(change) {
     // Only if the node is being moved to a new parent do we need to update the ancestor counts
-    if (change.oldParent === change.parent) {
+    if (change.oldObj.parent === change.parent) {
       return;
     }
 
     const node = await this.table.get(change.key);
     await this.resource.updateAncestors(
-      { id: change.oldParent, includeSelf: true, ignoreChanges: true },
+      { id: change.oldObj.parent, includeSelf: true, ignoreChanges: true },
       this._applyDiff.bind(this, node, -1)
     );
     await this.resource.updateAncestors(
diff --git a/contentcuration/contentcuration/frontend/shared/data/changes.js b/contentcuration/contentcuration/frontend/shared/data/changes.js
index 4129ea1515..f62a50a09e 100644
--- a/contentcuration/contentcuration/frontend/shared/data/changes.js
+++ b/contentcuration/contentcuration/frontend/shared/data/changes.js
@@ -383,7 +383,7 @@ export class DeletedChange extends Change {
 }
 
 export class MovedChange extends Change {
-  constructor({ target, position, parent, oldParent, ...fields }) {
+  constructor({ oldObj, target, position, parent, ...fields }) {
     fields.type = CHANGE_TYPES.MOVED;
     super(fields);
     if (this.table !== TABLE_NAMES.CONTENTNODE) {
@@ -391,10 +391,10 @@ export class MovedChange extends Change {
         `${this.changeType} is only supported by ${TABLE_NAMES.CONTENTNODE} table but ${this.table} was passed instead`
       );
     }
+    this.setAndValidateObj(oldObj, 'oldObj', omitIgnoredSubFields);
     this.setAndValidateIsDefined(target, 'target');
     this.setAndValidateLookup(position, 'position', RELATIVE_TREE_POSITIONS_LOOKUP);
     this.setAndValidateIsDefined(parent, 'parent');
-    this.setAndValidateIsDefined(oldParent, 'oldParent');
     this.setChannelAndUserId();
   }
 }
diff --git a/contentcuration/contentcuration/frontend/shared/data/resources.js b/contentcuration/contentcuration/frontend/shared/data/resources.js
index b18f62ec6a..4a7101f307 100644
--- a/contentcuration/contentcuration/frontend/shared/data/resources.js
+++ b/contentcuration/contentcuration/frontend/shared/data/resources.js
@@ -1395,7 +1395,6 @@ export const ContentNode = new TreeResource({
               // so that we can avoid doing fetches while such changes
               // are pending.
               parent: parent.id,
-              oldParent: isCreate ? null : node.parent,
               oldObj: isCreate ? null : node,
               table: this.tableName,
               source: CLIENTID,

From 433e2a9e5d68348da5e4530ab00fd5d56e22e8c5 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Wed, 14 Jun 2023 06:07:28 -0700
Subject: [PATCH 21/63] Fix issues when options is an object, not JSON string

---
 .../frontend/shared/data/public.js            | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/shared/data/public.js b/contentcuration/contentcuration/frontend/shared/data/public.js
index 644fb138a8..a6b88b4a5f 100644
--- a/contentcuration/contentcuration/frontend/shared/data/public.js
+++ b/contentcuration/contentcuration/frontend/shared/data/public.js
@@ -7,6 +7,7 @@
  *
  * See bottom of file for '@typedef's
  */
+import isString from 'lodash/isString';
 import isFunction from 'lodash/isFunction';
 import { RolesNames } from 'shared/leUtils/Roles';
 import { findLicense } from 'shared/utils/helpers';
@@ -29,6 +30,14 @@ function _convertMetadataLabel(key, obj) {
   return converted;
 }
 
+/**
+ * @see MPTTModel for explanation of this calculation
+ * @param obj
+ * @return {number}
+ */
+const total_count = obj =>
+  obj['kind'] === ContentKindsNames.TOPIC ? (obj['rght'] - obj['lft'] - 1) / 2 : 1;
+
 const CONTENT_NODE_FIELD_MAP = {
   // `destination field`: `source field` or value producing function
   node_id: 'id',
@@ -54,21 +63,23 @@ const CONTENT_NODE_FIELD_MAP = {
   categories: _convertMetadataLabel.bind({}, 'categories'),
   resource_types: _convertMetadataLabel.bind({}, 'resource_types'),
   tags: _convertMetadataLabel.bind({}, 'tags'),
-  extra_fields: obj => ({ options: JSON.parse(obj['options']) }),
+  extra_fields: obj => ({
+    options: isString(obj['options']) ? JSON.parse(obj['options']) : obj['options'],
+  }),
   role_visibility: obj => (obj['coach_content'] ? RolesNames.COACH : RolesNames.LEARNER),
   license: obj => findLicense(obj['license_name']),
   license_description: 'license_description',
   copyright_holder: 'license_owner',
   coach_count: 'num_coach_contents',
-  // see MPTTModel for explanation of this calculation
-  total_count: obj =>
-    obj['kind'] === ContentKindsNames.TOPIC ? (obj['rght'] - obj['lft'] - 1) / 2 : 1,
+
+  total_count,
   language: obj => obj['lang']['id'],
-  thumbnail_src: obj => new URL(obj['thumbnail'], window.location.origin).pathname,
+  thumbnail_src: obj =>
+    obj['thumbnail'] ? new URL(obj['thumbnail'], window.location.origin).toString() : null,
   thumbnail_encoding: () => '{}',
 
   // unavailable in public API
-  // 'resource_count': 'num_resources',
+  resource_count: total_count, // fake it, assume all nodes are resources
   // 'root_id': 'root_id',
 };
 

From fd6ef2377432274a397a5e27978fc4e8229ec29c Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Wed, 14 Jun 2023 06:08:22 -0700
Subject: [PATCH 22/63] Change page size options and default; enforce page size

---
 .../frontend/channelEdit/constants.js             |  6 ++++++
 .../ImportFromChannels/SearchResultsList.vue      | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/constants.js b/contentcuration/contentcuration/frontend/channelEdit/constants.js
index f36ebc5630..f2e5f5bcae 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/constants.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/constants.js
@@ -74,3 +74,9 @@ export const DraggableRegions = {
   TOPIC_VIEW: 'topicView',
   CLIPBOARD: 'clipboard',
 };
+
+/**
+ * Default page size for the import search page
+ * @type {number}
+ */
+export const ImportSearchPageSize = 15;
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchResultsList.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchResultsList.vue
index 815f0e49a2..c543cd6228 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchResultsList.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchResultsList.vue
@@ -94,10 +94,12 @@
   import { mapActions, mapGetters, mapState } from 'vuex';
   import debounce from 'lodash/debounce';
   import find from 'lodash/find';
+  import { ImportSearchPageSize } from '../../constants';
   import BrowsingCard from './BrowsingCard';
   import SavedSearchesModal from './SavedSearchesModal';
   import SearchFilters from './SearchFilters';
   import SearchFilterBar from './SearchFilterBar';
+  import logging from 'shared/logging';
   import Pagination from 'shared/views/Pagination';
   import Checkbox from 'shared/views/form/Checkbox';
   import LoadingText from 'shared/views/LoadingText';
@@ -137,9 +139,13 @@
       nodes() {
         return this.getContentNodes(this.nodeIds) || [];
       },
+      pageSizeOptions() {
+        return [10, 15, 25];
+      },
       pageSize: {
         get() {
-          return Number(this.$route.query.page_size) || 25;
+          const pageSize = Number(this.$route.query.page_size);
+          return this.pageSizeOptions.find(p => p === pageSize) || ImportSearchPageSize;
         },
         set(page_size) {
           this.$router.push({
@@ -152,9 +158,6 @@
           });
         },
       },
-      pageSizeOptions() {
-        return [25, 50, 100];
-      },
       isSelected() {
         return function(node) {
           return Boolean(find(this.selected, { id: node.id }));
@@ -190,6 +193,7 @@
         function() {
           this.fetchResourceSearchResults({
             ...this.$route.query,
+            page_size: this.pageSize,
             keywords: this.currentSearchTerm,
             exclude_channel: this.currentChannelId,
             last: undefined,
@@ -200,8 +204,9 @@
               this.pageCount = page.total_pages;
               this.totalCount = page.count;
             })
-            .catch(() => {
+            .catch(e => {
               this.loadFailed = true;
+              logging.error(e);
             });
         },
         1000,

From e5ca5c98b46aa156fd6daafd2ccf6931c1d7f117 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Wed, 14 Jun 2023 06:09:24 -0700
Subject: [PATCH 23/63] Hacks for unloaded nodes just in case

---
 .../vuex/importFromChannels/actions.js        | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js
index 3cb9a1d0b3..4d2be21114 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js
@@ -1,4 +1,5 @@
 import partition from 'lodash/partition';
+import { ImportSearchPageSize } from '../../constants';
 import client from 'shared/client';
 import urls from 'shared/urls';
 import * as publicApi from 'shared/data/public';
@@ -9,7 +10,7 @@ import { Channel, SavedSearch } from 'shared/data/resources';
 export async function fetchResourceSearchResults(context, params) {
   params = { ...params };
   delete params['last'];
-  params.page_size = params.page_size || 25;
+  params.page_size = params.page_size || ImportSearchPageSize;
   params.channel_list = params.channel_list || ChannelListTypes.PUBLIC;
 
   const response = await client.get(urls.search_list(), { params });
@@ -27,7 +28,7 @@ export async function fetchResourceSearchResults(context, params) {
       )
     : Promise.resolve([]);
 
-  await Promise.all([
+  const [privateNodesLoaded, publicNodesLoaded] = await Promise.all([
     // the loadContentNodes action already loads the nodes into vuex
     privatePromise,
     Promise.all(
@@ -48,7 +49,26 @@ export async function fetchResourceSearchResults(context, params) {
       }),
   ]);
 
-  return response.data;
+  // In case we failed to obtain data for all nodes, filter out the ones we didn't get
+  const results = response.data.results
+    .map(node => {
+      return (
+        privateNodesLoaded.find(n => n.id === node.id) ||
+        publicNodesLoaded.find(n => n.id === node.id)
+      );
+    })
+    .filter(Boolean);
+  // This won't work across multiple pages, if we fail to load some nodes, but that should be rare
+  const countDiff = response.data.results.length - results.length;
+  const count = response.data.count - countDiff;
+  const pageDiff = Math.floor(countDiff / params.page_size);
+
+  return {
+    count,
+    page: response.data.page,
+    results,
+    total_pages: response.data.total_pages - pageDiff,
+  };
 }
 
 export function loadChannels(context, params) {

From fe3d8661f489e96f9424efb875c41233d325ae50 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Wed, 14 Jun 2023 06:21:11 -0700
Subject: [PATCH 24/63] Only load published nodes in channel browsing

---
 .../views/ImportFromChannels/ContentTreeList.vue         | 9 ++++++++-
 .../frontend/channelEdit/vuex/contentNode/actions.js     | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue
index 3dc29fad36..809bdebd1a 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue
@@ -61,6 +61,7 @@
   import Checkbox from 'shared/views/form/Checkbox';
   import LoadingText from 'shared/views/LoadingText';
   import { constantsTranslationMixin } from 'shared/mixins';
+  import { ChannelListTypes } from 'shared/constants';
 
   export default {
     name: 'ContentTreeList',
@@ -154,8 +155,14 @@
     },
     mounted() {
       this.loading = true;
+      let params = {};
+      const channelListType = this.$route.query.channel_list || ChannelListTypes.PUBLIC;
+      if (channelListType === ChannelListTypes.PUBLIC) {
+        params = { published: true };
+      }
+
       return Promise.all([
-        this.loadChildren({ parent: this.topicId }),
+        this.loadChildren({ parent: this.topicId, ...params }),
         this.loadAncestors({ id: this.topicId }),
       ]).then(() => {
         this.loading = false;
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
index 89eba97c59..af29d46618 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
@@ -47,8 +47,8 @@ export function loadContentNodeByNodeId(context, nodeId) {
     });
 }
 
-export function loadChildren(context, { parent }) {
-  return loadContentNodes(context, { parent });
+export function loadChildren(context, { parent, ...params }) {
+  return loadContentNodes(context, { parent, ...params });
 }
 
 export function loadAncestors(context, { id }) {

From ee694830294c58c9f6c0a05aafd17ec7a50045b1 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Mon, 19 Jun 2023 06:45:38 -0700
Subject: [PATCH 25/63] Tweaks to import search public api usage

---
 .../ImportFromChannels/ContentTreeList.vue    |  2 ++
 .../channelEdit/vuex/contentNode/actions.js   | 23 +++++++++++++--
 .../vuex/importFromChannels/actions.js        | 26 ++++++++---------
 .../frontend/shared/data/public.js            | 29 +++++++++++++++----
 4 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue
index 809bdebd1a..433ea9434d 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ContentTreeList.vue
@@ -158,6 +158,8 @@
       let params = {};
       const channelListType = this.$route.query.channel_list || ChannelListTypes.PUBLIC;
       if (channelListType === ChannelListTypes.PUBLIC) {
+        // TODO: load from public API instead
+        // TODO: challenging because of node_id->id and root_id->channel_id
         params = { published: true };
       }
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
index af29d46618..ea461eb3f1 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
@@ -8,6 +8,7 @@ import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 import { findLicense } from 'shared/utils/helpers';
 import { RolesNames } from 'shared/leUtils/Roles';
 import { isNodeComplete } from 'shared/utils/validation';
+import * as publicApi from 'shared/data/public';
 
 import db from 'shared/data/db';
 
@@ -34,6 +35,20 @@ export function loadContentNode(context, id) {
     });
 }
 
+/**
+ * @param context
+ * @param {string} id
+ * @param {string} nodeId - Note: this is `node_id` not `id`
+ * @param {string} rootId
+ * @return {Promise<{}>}
+ */
+export async function loadPublicContentNode(context, { id, nodeId, rootId }) {
+  const publicNode = await publicApi.getContentNode(nodeId);
+  const localNode = publicApi.convertContentNodeResponse(id, rootId, publicNode);
+  context.commit('ADD_CONTENTNODE', localNode);
+  return localNode;
+}
+
 export function loadContentNodeByNodeId(context, nodeId) {
   const channelId = context.rootState.currentChannel.currentChannelId;
   return loadContentNodes(context, { '[node_id+channel_id]__in': [[nodeId, channelId]] })
@@ -47,8 +62,12 @@ export function loadContentNodeByNodeId(context, nodeId) {
     });
 }
 
-export function loadChildren(context, { parent, ...params }) {
-  return loadContentNodes(context, { parent, ...params });
+export function loadChildren(context, { parent, published = null }) {
+  const params = { parent };
+  if (published !== null) {
+    params.published = published;
+  }
+  return loadContentNodes(context, params);
 }
 
 export function loadAncestors(context, { id }) {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js
index 4d2be21114..f8f883b163 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js
@@ -2,7 +2,6 @@ import partition from 'lodash/partition';
 import { ImportSearchPageSize } from '../../constants';
 import client from 'shared/client';
 import urls from 'shared/urls';
-import * as publicApi from 'shared/data/public';
 import { NOVALUE, ChannelListTypes } from 'shared/constants';
 
 import { Channel, SavedSearch } from 'shared/data/resources';
@@ -34,19 +33,20 @@ export async function fetchResourceSearchResults(context, params) {
     Promise.all(
       // The public API is cached, so we can hopefully call it multiple times without
       // worrying too much about performance
-      publicNodes.map(async node => {
-        const publicNode = await publicApi.getContentNode(node.node_id).catch(() => null);
-        if (!publicNode) {
-          return;
-        }
-        return publicApi.convertContentNodeResponse(node.id, node.root_id, publicNode);
+      publicNodes.map(node => {
+        return context
+          .dispatch(
+            'contentNode/loadPublicContentNode',
+            {
+              id: node.id,
+              nodeId: node.node_id,
+              rootId: node.root_id,
+            },
+            { root: true }
+          )
+          .catch(() => null);
       })
-    )
-      .then(nodes => nodes.filter(Boolean))
-      .then(nodes => {
-        context.commit('contentNode/ADD_CONTENTNODES', nodes, { root: true });
-        return nodes;
-      }),
+    ).then(nodes => nodes.filter(Boolean)),
   ]);
 
   // In case we failed to obtain data for all nodes, filter out the ones we didn't get
diff --git a/contentcuration/contentcuration/frontend/shared/data/public.js b/contentcuration/contentcuration/frontend/shared/data/public.js
index a6b88b4a5f..85f5122964 100644
--- a/contentcuration/contentcuration/frontend/shared/data/public.js
+++ b/contentcuration/contentcuration/frontend/shared/data/public.js
@@ -7,7 +7,6 @@
  *
  * See bottom of file for '@typedef's
  */
-import isString from 'lodash/isString';
 import isFunction from 'lodash/isFunction';
 import { RolesNames } from 'shared/leUtils/Roles';
 import { findLicense } from 'shared/utils/helpers';
@@ -63,9 +62,27 @@ const CONTENT_NODE_FIELD_MAP = {
   categories: _convertMetadataLabel.bind({}, 'categories'),
   resource_types: _convertMetadataLabel.bind({}, 'resource_types'),
   tags: _convertMetadataLabel.bind({}, 'tags'),
-  extra_fields: obj => ({
-    options: isString(obj['options']) ? JSON.parse(obj['options']) : obj['options'],
-  }),
+  extra_fields: obj => {
+    const options = obj['options'];
+    let randomize = true;
+
+    if (obj['kind'] === ContentKindsNames.EXERCISE) {
+      const assessmentMetadata = obj['assessmentmetadata'];
+      if (!options['completion_criteria'] && assessmentMetadata['mastery_model']) {
+        options['completion_criteria'] = {
+          model: 'mastery',
+          threshold: {
+            mastery_model: JSON.parse(assessmentMetadata['mastery_model']),
+          },
+        };
+      }
+      randomize = Boolean(assessmentMetadata['randomize']);
+    }
+    return {
+      options,
+      randomize,
+    };
+  },
   role_visibility: obj => (obj['coach_content'] ? RolesNames.COACH : RolesNames.LEARNER),
   license: obj => findLicense(obj['license_name']),
   license_description: 'license_description',
@@ -88,9 +105,9 @@ const CONTENT_NODE_FIELD_MAP = {
  * @param {string} id - the actual ID of the node on Studio's side
  * @param {string} root_id - the root content node ID
  * @param {PublicContentNode} publicNode
- * @return {Promise<{id}>}
+ * @return {{id}}
  */
-export async function convertContentNodeResponse(id, root_id, publicNode) {
+export function convertContentNodeResponse(id, root_id, publicNode) {
   const contentNode = {
     // the public API does not return the actual id, but 'node_id' as the id, so this requires
     // us to know what the actual id is

From 1f0523cf20a8b2b7f905eb987a814725760e40a5 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Tue, 20 Jun 2023 11:27:40 -0700
Subject: [PATCH 26/63] Update tests to prevent strings in JSON.

---
 contentcuration/contentcuration/tests/test_exportchannel.py | 5 ++---
 contentcuration/contentcuration/utils/publish.py            | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/contentcuration/contentcuration/tests/test_exportchannel.py b/contentcuration/contentcuration/tests/test_exportchannel.py
index 8e629a1379..ecd69dc34e 100644
--- a/contentcuration/contentcuration/tests/test_exportchannel.py
+++ b/contentcuration/contentcuration/tests/test_exportchannel.py
@@ -1,6 +1,5 @@
 from __future__ import absolute_import
 
-import json
 import os
 import random
 import string
@@ -302,8 +301,8 @@ def test_channel_icon_encoding(self):
     def test_assessment_metadata(self):
         for i, exercise in enumerate(kolibri_models.ContentNode.objects.filter(kind="exercise")):
             asm = exercise.assessmentmetadata.first()
-            self.assertTrue(isinstance(json.loads(asm.assessment_item_ids), list))
-            mastery = json.loads(asm.mastery_model)
+            self.assertTrue(isinstance(asm.assessment_item_ids, list))
+            mastery = asm.mastery_model
             self.assertTrue(isinstance(mastery, dict))
             self.assertEqual(mastery["type"], exercises.DO_ALL if i == 0 else exercises.M_OF_N)
             self.assertEqual(mastery["m"], 3 if i == 0 else 1)
diff --git a/contentcuration/contentcuration/utils/publish.py b/contentcuration/contentcuration/utils/publish.py
index b0e9bab857..54969c3f68 100644
--- a/contentcuration/contentcuration/utils/publish.py
+++ b/contentcuration/contentcuration/utils/publish.py
@@ -526,9 +526,9 @@ def process_assessment_metadata(ccnode, kolibrinode):
     kolibrimodels.AssessmentMetaData.objects.create(
         id=uuid.uuid4(),
         contentnode=kolibrinode,
-        assessment_item_ids=json.dumps(assessment_item_ids),
+        assessment_item_ids=assessment_item_ids,
         number_of_assessments=assessment_items.count(),
-        mastery_model=json.dumps(mastery_model),
+        mastery_model=mastery_model,
         randomize=randomize,
         is_manipulable=ccnode.kind_id == content_kinds.EXERCISE,
     )

From c79d3f266c852865756890d8ab7b26ac565ef4bc Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Tue, 20 Jun 2023 12:08:45 -0700
Subject: [PATCH 27/63] Fix previewing exercises in import search

---
 .../channelEdit/components/ResourceDrawer.vue   |  5 +++++
 .../channelEdit/components/ResourcePanel.vue    | 17 +++++++++++++----
 .../ImportFromChannelsModal.vue                 |  1 +
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ResourceDrawer.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ResourceDrawer.vue
index 57557ca609..3b9acbfdbf 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ResourceDrawer.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ResourceDrawer.vue
@@ -19,6 +19,7 @@
         <ResourcePanel
           :nodeId="nodeId"
           :channelId="channelId"
+          :useRouting="useRouting"
           @close="$emit('close')"
         >
           <template #navigation>
@@ -66,6 +67,10 @@
         type: Boolean,
         default: true,
       },
+      useRouting: {
+        type: Boolean,
+        default: true,
+      },
     },
     methods: {
       // @public
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
index a7afdab919..8046b9b591 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
@@ -75,8 +75,8 @@
       >
         <VTab
           class="px-2"
-          :to="{ query: { tab: 'questions' } }"
           exact
+          @change="tab = 'questions'"
         >
           {{ $tr('questions') }}
           <Icon
@@ -90,8 +90,8 @@
         </VTab>
         <VTab
           class="px-2"
-          :to="{ query: { tab: 'details' } }"
           exact
+          @change="tab = 'details'"
         >
           {{ $tr('details') }}
           <Icon
@@ -587,11 +587,16 @@
         type: Boolean,
         default: false,
       },
+      useRouting: {
+        type: Boolean,
+        default: true,
+      },
     },
     data() {
       return {
         loading: false,
         showAnswers: false,
+        currentTab: 'details',
       };
     },
     computed: {
@@ -619,6 +624,10 @@
           if (!this.isExercise) {
             return;
           }
+          if (!this.useRouting) {
+            this.currentTab = value;
+            return;
+          }
           // If viewing an exercise, we need to synchronize the the route's
           // query params with the 'tab' value
           const newRoute = { query: { tab: value } };
@@ -629,8 +638,8 @@
           }
         },
         get() {
-          if (!this.isExercise) {
-            return 'details';
+          if (!this.isExercise || !this.useRouting) {
+            return this.currentTab;
           }
           return this.$route.query.tab || 'questions';
         },
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue
index 60423ee33b..0999b077f1 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue
@@ -27,6 +27,7 @@
       fixed
       :permanent="false"
       :nodeId="previewNode.id"
+      :useRouting="false"
       @close="showPreview = false"
     >
       <template #actions>

From 7a16e1d551904a0074dca6dc074f494b9155c916 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Tue, 20 Jun 2023 12:10:35 -0700
Subject: [PATCH 28/63] Further reduce default page size

---
 .../contentcuration/frontend/channelEdit/constants.js           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/constants.js b/contentcuration/contentcuration/frontend/channelEdit/constants.js
index f2e5f5bcae..6512e9e9b4 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/constants.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/constants.js
@@ -79,4 +79,4 @@ export const DraggableRegions = {
  * Default page size for the import search page
  * @type {number}
  */
-export const ImportSearchPageSize = 15;
+export const ImportSearchPageSize = 10;

From 7700c2d5e94ccc22439c048b88db37642262e39a Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Tue, 20 Jun 2023 12:21:26 -0700
Subject: [PATCH 29/63] Defensive check on mastery_model JSON

---
 .../contentcuration/frontend/shared/data/public.js          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/shared/data/public.js b/contentcuration/contentcuration/frontend/shared/data/public.js
index 85f5122964..eb816f35c9 100644
--- a/contentcuration/contentcuration/frontend/shared/data/public.js
+++ b/contentcuration/contentcuration/frontend/shared/data/public.js
@@ -7,6 +7,7 @@
  *
  * See bottom of file for '@typedef's
  */
+import isString from 'lodash/isString';
 import isFunction from 'lodash/isFunction';
 import { RolesNames } from 'shared/leUtils/Roles';
 import { findLicense } from 'shared/utils/helpers';
@@ -72,7 +73,10 @@ const CONTENT_NODE_FIELD_MAP = {
         options['completion_criteria'] = {
           model: 'mastery',
           threshold: {
-            mastery_model: JSON.parse(assessmentMetadata['mastery_model']),
+            // TODO: remove JSON.parse, since we shouldn't be receiving strings from the API
+            mastery_model: isString(assessmentMetadata['mastery_model'])
+              ? JSON.parse(assessmentMetadata['mastery_model'])
+              : assessmentMetadata['mastery_model'],
           },
         };
       }

From 9ea9cdfeb64ede7a8d1fc70db3dd07d1c1e7832c Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Mon, 19 Jun 2023 08:51:46 -0700
Subject: [PATCH 30/63] Prevent mapping of tags over 30 chars

---
 .../contentcuration/utils/publish.py          |  3 +-
 .../kolibri_content/base_models.py            |  5 ++-
 contentcuration/kolibri_public/tests/base.py  | 33 ++++++++++++++++
 .../kolibri_public/tests/test_mapper.py       | 23 +++++++----
 .../kolibri_public/utils/mapper.py            | 38 +++++++++++++------
 5 files changed, 82 insertions(+), 20 deletions(-)

diff --git a/contentcuration/contentcuration/utils/publish.py b/contentcuration/contentcuration/utils/publish.py
index b0e9bab857..a2bb5dde5c 100644
--- a/contentcuration/contentcuration/utils/publish.py
+++ b/contentcuration/contentcuration/utils/publish.py
@@ -31,6 +31,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import override
 from kolibri_content import models as kolibrimodels
+from kolibri_content.base_models import MAX_TAG_LENGTH
 from kolibri_content.router import get_active_content_database
 from kolibri_content.router import using_content_database
 from kolibri_public.utils.mapper import ChannelMapper
@@ -760,7 +761,7 @@ def map_tags_to_node(kolibrinode, ccnode):
 
     for tag in ccnode.tags.all():
         t, _new = kolibrimodels.ContentTag.objects.get_or_create(pk=tag.pk, tag_name=tag.tag_name)
-        if len(t.tag_name) <= 30:
+        if len(t.tag_name) <= MAX_TAG_LENGTH:
             tags_to_add.append(t)
 
     kolibrinode.tags.set(tags_to_add)
diff --git a/contentcuration/kolibri_content/base_models.py b/contentcuration/kolibri_content/base_models.py
index 9fb574fa78..0fbe59c710 100644
--- a/contentcuration/kolibri_content/base_models.py
+++ b/contentcuration/kolibri_content/base_models.py
@@ -20,9 +20,12 @@
 from mptt.models import TreeForeignKey
 
 
+MAX_TAG_LENGTH = 30
+
+
 class ContentTag(models.Model):
     id = UUIDField(primary_key=True)
-    tag_name = models.CharField(max_length=30, blank=True)
+    tag_name = models.CharField(max_length=MAX_TAG_LENGTH, blank=True)
 
     class Meta:
         abstract = True
diff --git a/contentcuration/kolibri_public/tests/base.py b/contentcuration/kolibri_public/tests/base.py
index 044755591d..40492dd960 100644
--- a/contentcuration/kolibri_public/tests/base.py
+++ b/contentcuration/kolibri_public/tests/base.py
@@ -32,6 +32,10 @@ def choices(sequence, k):
     return [random.choice(sequence) for _ in range(0, k)]
 
 
+OKAY_TAG = "okay_tag"
+BAD_TAG = "tag_is_too_long_because_it_is_over_30_characters"
+
+
 class ChannelBuilder(object):
     """
     This class is purely to generate all the relevant data for a single
@@ -75,8 +79,14 @@ def generate_new_tree(self):
         self.channel = self.channel_data()
         self.files = {}
         self.localfiles = {}
+        self.content_tags = {}
+
         self.node_to_files_map = {}
         self.localfile_to_files_map = {}
+        self.content_tag_map = {}
+
+        for tag_name in [OKAY_TAG, BAD_TAG]:
+            self.content_tag_data(tag_name)
 
         self.root_node = self.generate_topic()
         if "root_id" in self.channel:
@@ -117,7 +127,19 @@ def generate_nodes_from_root_node(self):
         self.nodes = {n["id"]: n for n in map(to_dict, self._django_nodes)}
 
     def insert_into_default_db(self):
+        self.models.ContentTag.objects.bulk_create(
+            (self.models.ContentTag(**tag) for tag in self.content_tags.values())
+        )
         self.models.ContentNode.objects.bulk_create(self._django_nodes)
+        self.models.ContentNode.tags.through.objects.bulk_create(
+            (
+                self.models.ContentNode.tags.through(
+                    contentnode_id=node["id"], contenttag_id=tag["id"]
+                )
+                for node in self.nodes.values()
+                for tag in self.content_tags.values()
+            )
+        )
         self.models.ChannelMetadata.objects.create(**self.channel)
         self.models.LocalFile.objects.bulk_create(
             (self.models.LocalFile(**local) for local in self.localfiles.values())
@@ -153,6 +175,7 @@ def data(self):
             "content_contentnode": list(self.nodes.values()),
             "content_file": list(self.files.values()),
             "content_localfile": list(self.localfiles.values()),
+            "content_contenttag": list(self.content_tags.values()),
         }
 
     def recurse_and_generate(self, parent_id, levels):
@@ -190,6 +213,8 @@ def generate_leaf(self, parent_id):
             thumbnail=True,
             preset=format_presets.VIDEO_THUMBNAIL,
         )
+        for tag_id in self.content_tags:
+            self.content_tag_map[node["id"]] = [tag_id]
         return node
 
     def channel_data(self, channel_id=None, version=1):
@@ -218,6 +243,14 @@ def channel_data(self, channel_id=None, version=1):
             del channel_data[field]
         return channel_data
 
+    def content_tag_data(self, tag_name):
+        data = {
+            "id": uuid4_hex(),
+            "tag_name": tag_name,
+        }
+        self.content_tags[data["id"]] = data
+        return data
+
     def localfile_data(self, extension="mp4"):
         data = {
             "file_size": random.randint(1, 1000),
diff --git a/contentcuration/kolibri_public/tests/test_mapper.py b/contentcuration/kolibri_public/tests/test_mapper.py
index 13066ede63..08c9c219ff 100644
--- a/contentcuration/kolibri_public/tests/test_mapper.py
+++ b/contentcuration/kolibri_public/tests/test_mapper.py
@@ -9,6 +9,7 @@
 from kolibri_content.router import using_content_database
 from kolibri_public import models as kolibri_public_models
 from kolibri_public.tests.base import ChannelBuilder
+from kolibri_public.tests.base import OKAY_TAG
 from kolibri_public.utils.mapper import ChannelMapper
 
 from contentcuration.models import Channel
@@ -19,14 +20,14 @@ class ChannelMapperTest(TestCase):
     @property
     def overrides(self):
         return {
-        kolibri_public_models.ContentNode: {
-            "available": True,
-            "tree_id": self.mapper.tree_id,
-        },
-        kolibri_public_models.LocalFile: {
-            "available": True,
+            kolibri_public_models.ContentNode: {
+                "available": True,
+                "tree_id": self.mapper.tree_id,
+            },
+            kolibri_public_models.LocalFile: {
+                "available": True,
+            }
         }
-    }
 
     @classmethod
     def setUpClass(cls):
@@ -57,6 +58,10 @@ def _assert_model(self, source, mapped, Model):
                     self.assertEqual(getattr(source, column), getattr(mapped, column))
 
     def _assert_node(self, source, mapped):
+        """
+        :param source: kolibri_content_models.ContentNode
+        :param mapped: kolibri_public_models.ContentNode
+        """
         self._assert_model(source, mapped, kolibri_public_models.ContentNode)
 
         for src, mpd in zip(source.assessmentmetadata.all(), mapped.assessmentmetadata.all()):
@@ -66,6 +71,10 @@ def _assert_node(self, source, mapped):
             self._assert_model(src, mpd, kolibri_public_models.File)
             self._assert_model(src.local_file, mpd.local_file, kolibri_public_models.LocalFile)
 
+        # should only map OKAY_TAG and not BAD_TAG
+        for mapped_tag in mapped.tags.all():
+            self.assertEqual(OKAY_TAG, mapped_tag.tag_name)
+
     def _recurse_and_assert(self, sources, mappeds, recursion_depth=0):
         recursion_depths = []
         for source, mapped in zip(sources, mappeds):
diff --git a/contentcuration/kolibri_public/utils/mapper.py b/contentcuration/kolibri_public/utils/mapper.py
index 2f3db0811f..e929cf5512 100644
--- a/contentcuration/kolibri_public/utils/mapper.py
+++ b/contentcuration/kolibri_public/utils/mapper.py
@@ -1,5 +1,7 @@
 from django.db import transaction
+from django.db.models.functions import Length
 from kolibri_content import models as kolibri_content_models
+from kolibri_content.base_models import MAX_TAG_LENGTH
 from kolibri_public import models as kolibri_public_models
 from kolibri_public.search import annotate_label_bitmasks
 from kolibri_public.utils.annotation import set_channel_metadata_fields
@@ -24,14 +26,14 @@ def __init__(self, channel, public=True):
     @property
     def overrides(self):
         return {
-        kolibri_public_models.ContentNode: {
-            "available": True,
-            "tree_id": self.tree_id,
-        },
-        kolibri_public_models.LocalFile: {
-            "available": True,
+            kolibri_public_models.ContentNode: {
+                "available": True,
+                "tree_id": self.tree_id,
+            },
+            kolibri_public_models.LocalFile: {
+                "available": True,
+            }
         }
-    }
 
     def _handle_old_tree_if_exists(self):
         try:
@@ -135,17 +137,31 @@ def _map(
         return [node_copy]
 
     def _copy_tags(self, node_ids):
-        source_tags_mappings = kolibri_content_models.ContentNode.tags.through.objects.filter(
+        initial_source_tag_mappings = kolibri_content_models.ContentNode.tags.through.objects.filter(
             contentnode_id__in=node_ids
         )
 
-        source_tags = kolibri_content_models.ContentTag.objects.filter(
-            id__in=source_tags_mappings.values_list("contenttag_id", flat=True)
+        source_tags = (
+            kolibri_content_models.ContentTag.objects
+            .annotate(
+                tag_name_len=Length("tag_name"),
+            )
+            .filter(
+                id__in=initial_source_tag_mappings.values_list("contenttag_id", flat=True),
+                tag_name_len__lte=MAX_TAG_LENGTH,
+            )
+        )
+
+        source_tag_mappings = (
+            initial_source_tag_mappings
+            .filter(
+                contenttag_id__in=source_tags.values_list("id", flat=True),
+            )
         )
 
         self._map_and_bulk_create_model(source_tags, kolibri_public_models.ContentTag)
 
-        self._map_and_bulk_create_model(source_tags_mappings, kolibri_public_models.ContentNode.tags.through)
+        self._map_and_bulk_create_model(source_tag_mappings, kolibri_public_models.ContentNode.tags.through)
 
     def _copy_assessment_metadata(self, node_ids):
         node_assessmentmetadata = kolibri_content_models.AssessmentMetaData.objects.filter(contentnode_id__in=node_ids)

From 5a23182262b405643fbd78d3fcf36422b52e97a4 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Tue, 20 Jun 2023 13:05:12 -0700
Subject: [PATCH 31/63] Configure channel builder to optionally add bad data

---
 contentcuration/kolibri_public/tests/base.py  | 35 +++++++++++++++++--
 .../kolibri_public/tests/test_content_app.py  |  3 ++
 .../kolibri_public/tests/test_mapper.py       | 12 +++++--
 .../kolibri_public/utils/mapper.py            |  6 +++-
 4 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/contentcuration/kolibri_public/tests/base.py b/contentcuration/kolibri_public/tests/base.py
index 40492dd960..1e5f341ab2 100644
--- a/contentcuration/kolibri_public/tests/base.py
+++ b/contentcuration/kolibri_public/tests/base.py
@@ -35,6 +35,13 @@ def choices(sequence, k):
 OKAY_TAG = "okay_tag"
 BAD_TAG = "tag_is_too_long_because_it_is_over_30_characters"
 
+PROBLEMATIC_HTML5_NODE = "ab9d3fd905c848a6989936c609405abb"
+
+BUILDER_DEFAULT_OPTIONS = {
+    "problematic_tags": False,
+    "problematic_nodes": False,
+}
+
 
 class ChannelBuilder(object):
     """
@@ -53,11 +60,15 @@ class ChannelBuilder(object):
         "root_node",
     )
 
-    def __init__(self, levels=3, num_children=5, models=kolibri_public_models):
+    def __init__(self, levels=3, num_children=5, models=kolibri_public_models, options=None):
         self.levels = levels
         self.num_children = num_children
         self.models = models
+        self.options = BUILDER_DEFAULT_OPTIONS.copy()
+        if options:
+            self.options.update(options)
 
+        self.content_tags = {}
         self._excluded_channel_fields = None
         self._excluded_node_fields = None
 
@@ -79,13 +90,15 @@ def generate_new_tree(self):
         self.channel = self.channel_data()
         self.files = {}
         self.localfiles = {}
-        self.content_tags = {}
 
         self.node_to_files_map = {}
         self.localfile_to_files_map = {}
         self.content_tag_map = {}
 
-        for tag_name in [OKAY_TAG, BAD_TAG]:
+        tags = [OKAY_TAG]
+        if self.options["problematic_tags"]:
+            tags.append(BAD_TAG)
+        for tag_name in tags:
             self.content_tag_data(tag_name)
 
         self.root_node = self.generate_topic()
@@ -98,6 +111,22 @@ def generate_new_tree(self):
             self.root_node["children"] = self.recurse_and_generate(
                 self.root_node["id"], self.levels
             )
+            if self.options["problematic_nodes"]:
+                self.root_node["children"].extend(self.generate_problematic_nodes())
+
+    def generate_problematic_nodes(self):
+        nodes = []
+        html5_not_a_topic = self.contentnode_data(
+            node_id=PROBLEMATIC_HTML5_NODE,
+            kind=content_kinds.HTML5,
+            parent_id=self.root_node["id"],
+        )
+        # the problem: this node is not a topic, but it has children
+        html5_not_a_topic["children"] = [
+            self.contentnode_data(parent_id=PROBLEMATIC_HTML5_NODE)
+        ]
+        nodes.append(html5_not_a_topic)
+        return nodes
 
     def load_data(self):
         try:
diff --git a/contentcuration/kolibri_public/tests/test_content_app.py b/contentcuration/kolibri_public/tests/test_content_app.py
index c6f4327972..50c4a6a35b 100644
--- a/contentcuration/kolibri_public/tests/test_content_app.py
+++ b/contentcuration/kolibri_public/tests/test_content_app.py
@@ -11,6 +11,7 @@
 from django.utils.http import http_date
 from kolibri_public import models
 from kolibri_public.tests.base import ChannelBuilder
+from kolibri_public.tests.base import OKAY_TAG
 from le_utils.constants import content_kinds
 from rest_framework.test import APITestCase
 
@@ -373,6 +374,8 @@ def test_contentnode_tags(self):
         response = self.client.get(
             reverse("publiccontentnode-detail", kwargs={"pk": self.root.id})
         )
+        # added by channel builder
+        tags.append(OKAY_TAG)
         self.assertEqual(set(response.data["tags"]), set(tags))
 
     def test_channelmetadata_list(self):
diff --git a/contentcuration/kolibri_public/tests/test_mapper.py b/contentcuration/kolibri_public/tests/test_mapper.py
index 08c9c219ff..4411032ba4 100644
--- a/contentcuration/kolibri_public/tests/test_mapper.py
+++ b/contentcuration/kolibri_public/tests/test_mapper.py
@@ -11,6 +11,7 @@
 from kolibri_public.tests.base import ChannelBuilder
 from kolibri_public.tests.base import OKAY_TAG
 from kolibri_public.utils.mapper import ChannelMapper
+from le_utils.constants import content_kinds
 
 from contentcuration.models import Channel
 
@@ -37,7 +38,10 @@ def setUpClass(cls):
 
         with using_content_database(cls.tempdb):
             call_command("migrate", "content", database=get_active_content_database(), no_input=True)
-            builder = ChannelBuilder(models=kolibri_content_models)
+            builder = ChannelBuilder(models=kolibri_content_models, options={
+                "problematic_tags": True,
+                "problematic_nodes": True,
+            })
             builder.insert_into_default_db()
             cls.source_root = kolibri_content_models.ContentNode.objects.get(id=builder.root_node["id"])
             cls.channel = kolibri_content_models.ChannelMetadata.objects.get(id=builder.channel["id"])
@@ -81,7 +85,11 @@ def _recurse_and_assert(self, sources, mappeds, recursion_depth=0):
             self._assert_node(source, mapped)
             source_children = source.children.all()
             mapped_children = mapped.children.all()
-            self.assertEqual(len(source_children), len(mapped_children))
+            if mapped.kind == content_kinds.TOPIC:
+                self.assertEqual(len(source_children), len(mapped_children))
+            else:
+                self.assertEqual(0, len(mapped_children))
+
             recursion_depths.append(
                 self._recurse_and_assert(
                     source_children,
diff --git a/contentcuration/kolibri_public/utils/mapper.py b/contentcuration/kolibri_public/utils/mapper.py
index e929cf5512..a74f369403 100644
--- a/contentcuration/kolibri_public/utils/mapper.py
+++ b/contentcuration/kolibri_public/utils/mapper.py
@@ -216,6 +216,10 @@ def _deep_map(
 
         mapped_nodes = kolibri_public_models.ContentNode.objects.bulk_create(nodes_to_create)
 
-        self._copy_associated_objects(source_nodes)
+        # filter to only the nodes that were created, since some source nodes could have
+        # been problematic
+        self._copy_associated_objects(source_nodes.filter(
+            id__in=[mapped_node.id for mapped_node in mapped_nodes],
+        ))
 
         return mapped_nodes

From 2eece7ede77cc801059b4c79c2669f4ab433e5aa Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Tue, 20 Jun 2023 13:10:35 -0700
Subject: [PATCH 32/63] Allow export command to be run without channel existing
 locally

---
 .../export_channels_to_kolibri_public.py      | 75 +++++++++++--------
 .../kolibri_public/utils/annotation.py        |  9 ++-
 2 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/contentcuration/kolibri_public/management/commands/export_channels_to_kolibri_public.py b/contentcuration/kolibri_public/management/commands/export_channels_to_kolibri_public.py
index b4b88ab4ba..076053ad90 100644
--- a/contentcuration/kolibri_public/management/commands/export_channels_to_kolibri_public.py
+++ b/contentcuration/kolibri_public/management/commands/export_channels_to_kolibri_public.py
@@ -27,6 +27,50 @@
 
 
 class Command(BaseCommand):
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--channel-id",
+            type=str,
+            dest="channel_id",
+            help="The channel_id for which generate kolibri_public models [default: all channels]"
+        )
+
+    def handle(self, *args, **options):
+        ids_to_export = []
+
+        if options["channel_id"]:
+            ids_to_export.append(options["channel_id"])
+        else:
+            self._republish_problem_channels()
+            public_channel_ids = set(Channel.objects.filter(public=True, deleted=False, main_tree__published=True).values_list("id", flat=True))
+            kolibri_public_channel_ids = set(ChannelMetadata.objects.all().values_list("id", flat=True))
+            ids_to_export = public_channel_ids.difference(kolibri_public_channel_ids)
+
+        count = 0
+        for channel_id in ids_to_export:
+            try:
+                self._export_channel(channel_id)
+                count += 1
+            except FileNotFoundError:
+                logger.warning("Tried to export channel {} to kolibri_public but its published channel database could not be found".format(channel_id))
+            except Exception as e:
+                logger.exception("Failed to export channel {} to kolibri_public because of error: {}".format(channel_id, e))
+        logger.info("Successfully put {} channels into kolibri_public".format(count))
+
+    def _export_channel(self, channel_id):
+        logger.info("Putting channel {} into kolibri_public".format(channel_id))
+        db_location = os.path.join(settings.DB_ROOT, "{id}.sqlite3".format(id=channel_id))
+        with storage.open(db_location) as storage_file:
+            with tempfile.NamedTemporaryFile(suffix=".sqlite3") as db_file:
+                shutil.copyfileobj(storage_file, db_file)
+                db_file.seek(0)
+                with using_content_database(db_file.name):
+                    # Run migration to handle old content databases published prior to current fields being added.
+                    call_command("migrate", app_label=KolibriContentConfig.label, database=get_active_content_database())
+                    channel = ExportedChannelMetadata.objects.get(id=channel_id)
+                    logger.info("Found channel {} for id: {} mapping now".format(channel.name, channel_id))
+                    mapper = ChannelMapper(channel)
+                    mapper.run()
 
     def _republish_problem_channels(self):
         twenty_19 = datetime(year=2019, month=1, day=1)
@@ -53,34 +97,3 @@ def _republish_problem_channels(self):
                 channel.save()
             except Exception as e:
                 logger.exception("Failed to export channel {} to kolibri_public because of error: {}".format(channel.id, e))
-
-    def _export_channel(self, channel_id):
-        logger.info("Putting channel {} into kolibri_public".format(channel_id))
-        db_location = os.path.join(settings.DB_ROOT, "{id}.sqlite3".format(id=channel_id))
-        with storage.open(db_location) as storage_file:
-            with tempfile.NamedTemporaryFile(suffix=".sqlite3") as db_file:
-                shutil.copyfileobj(storage_file, db_file)
-                db_file.seek(0)
-                with using_content_database(db_file.name):
-                    # Run migration to handle old content databases published prior to current fields being added.
-                    call_command("migrate", app_label=KolibriContentConfig.label, database=get_active_content_database())
-                    channel = ExportedChannelMetadata.objects.get(id=channel_id)
-                    logger.info("Found channel {} for id: {} mapping now".format(channel.name, channel_id))
-                    mapper = ChannelMapper(channel)
-                    mapper.run()
-
-    def handle(self, *args, **options):
-        self._republish_problem_channels()
-        public_channel_ids = set(Channel.objects.filter(public=True, deleted=False, main_tree__published=True).values_list("id", flat=True))
-        kolibri_public_channel_ids = set(ChannelMetadata.objects.all().values_list("id", flat=True))
-        ids_to_export = public_channel_ids.difference(kolibri_public_channel_ids)
-        count = 0
-        for channel_id in ids_to_export:
-            try:
-                self._export_channel(channel_id)
-                count += 1
-            except FileNotFoundError:
-                logger.warning("Tried to export channel {} to kolibri_public but its published channel database could not be found".format(channel_id))
-            except Exception as e:
-                logger.exception("Failed to export channel {} to kolibri_public because of error: {}".format(channel_id, e))
-        logger.info("Successfully put {} channels into kolibri_public".format(count))
diff --git a/contentcuration/kolibri_public/utils/annotation.py b/contentcuration/kolibri_public/utils/annotation.py
index a2fca0289f..3cb800a3d9 100644
--- a/contentcuration/kolibri_public/utils/annotation.py
+++ b/contentcuration/kolibri_public/utils/annotation.py
@@ -75,6 +75,9 @@ def calculate_next_order(channel, public=False):
             # Ensure that this channel is always included in the list.
             Q(public=True, deleted=False, main_tree__published=True) | Q(id=channel.id)
         ).order_by("-priority").values_list("id", flat=True))
-        order = channel_list_order.index(channel.id)
-        channel.order = order
-        channel.save()
+        # this shouldn't happen, but if we're exporting a channel database to Kolibri Public
+        # and the channel does not actually exist locally, then this would fail
+        if channel.id in channel_list_order:
+            order = channel_list_order.index(channel.id)
+            channel.order = order
+            channel.save()

From a04539e73ad3edadb5d3cc7aae4f3a6c958fa4c5 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Tue, 20 Jun 2023 13:28:49 -0700
Subject: [PATCH 33/63] Prevent publishing from modifying published options.

---
 contentcuration/contentcuration/tests/test_exportchannel.py | 6 ++++++
 contentcuration/contentcuration/utils/publish.py            | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/tests/test_exportchannel.py b/contentcuration/contentcuration/tests/test_exportchannel.py
index ecd69dc34e..c18d9b6fd1 100644
--- a/contentcuration/contentcuration/tests/test_exportchannel.py
+++ b/contentcuration/contentcuration/tests/test_exportchannel.py
@@ -397,6 +397,12 @@ def test_publish_no_modify_exercise_extra_fields(self):
             "n": 2,
             "mastery_model": exercises.M_OF_N,
         })
+        published_exercise = kolibri_models.ContentNode.objects.get(title="Mastery test")
+        self.assertEqual(published_exercise.options["completion_criteria"]["threshold"], {
+            "m": 1,
+            "n": 2,
+            "mastery_model": exercises.M_OF_N,
+        })
 
     def test_publish_no_modify_legacy_exercise_extra_fields(self):
         current_exercise = cc.ContentNode.objects.get(title="Legacy Mastery test")
diff --git a/contentcuration/contentcuration/utils/publish.py b/contentcuration/contentcuration/utils/publish.py
index 54969c3f68..9edc428309 100644
--- a/contentcuration/contentcuration/utils/publish.py
+++ b/contentcuration/contentcuration/utils/publish.py
@@ -11,6 +11,7 @@
 import uuid
 import zipfile
 from builtins import str
+from copy import deepcopy
 from itertools import chain
 
 from django.conf import settings
@@ -494,7 +495,7 @@ def process_assessment_metadata(ccnode, kolibrinode):
     randomize = extra_fields.get('randomize') if extra_fields.get('randomize') is not None else True
     assessment_item_ids = [a.assessment_id for a in assessment_items]
 
-    exercise_data = extra_fields.get('options').get('completion_criteria').get('threshold')
+    exercise_data = deepcopy(extra_fields.get('options').get('completion_criteria').get('threshold'))
 
     exercise_data_type = exercise_data.get('mastery_model', "")
 

From 63693d39e4e14f9840dd32296cd0e4db320ccda8 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Tue, 20 Jun 2023 13:32:24 -0700
Subject: [PATCH 34/63] Don't allow adding nodes to non-topics

---
 .../tests/views/test_views_internal.py        | 27 +++++++++++++++++++
 .../contentcuration/views/internal.py         |  7 +++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/contentcuration/contentcuration/tests/views/test_views_internal.py b/contentcuration/contentcuration/tests/views/test_views_internal.py
index 58a6792884..3a23654ee6 100644
--- a/contentcuration/contentcuration/tests/views/test_views_internal.py
+++ b/contentcuration/contentcuration/tests/views/test_views_internal.py
@@ -231,6 +231,33 @@ def test_tag_greater_than_30_chars_excluded(self):
 
         self.assertEqual(response.status_code, 400, response.content)
 
+    def test_add_nodes__not_a_topic(self):
+        resource_node = self._make_node_data()
+        test_data = {
+            "root_id": self.root_node.id,
+            "content_data": [
+                resource_node,
+            ],
+        }
+        response = self.admin_client().post(
+            reverse_lazy("api_add_nodes_to_tree"), data=test_data, format="json"
+        )
+        # should succeed
+        self.assertEqual(response.status_code, 200, response.content)
+        resource_node_id = next(iter(response.json().get('root_ids').values()))
+
+        invalid_child = self._make_node_data()
+        test_data = {
+            "root_id": resource_node_id,
+            "content_data": [
+                invalid_child,
+            ],
+        }
+        response = self.admin_client().post(
+            reverse_lazy("api_add_nodes_to_tree"), data=test_data, format="json"
+        )
+        self.assertEqual(response.status_code, 400, response.content)
+
     def test_invalid_metadata_label_excluded(self):
         invalid_metadata_labels = self._make_node_data()
         invalid_metadata_labels["title"] = "invalid_metadata_labels"
diff --git a/contentcuration/contentcuration/views/internal.py b/contentcuration/contentcuration/views/internal.py
index 4dbc51c8ef..5767928719 100644
--- a/contentcuration/contentcuration/views/internal.py
+++ b/contentcuration/contentcuration/views/internal.py
@@ -2,8 +2,8 @@
 import logging
 from builtins import str
 from collections import namedtuple
-
 from distutils.version import LooseVersion
+
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.exceptions import PermissionDenied
 from django.core.exceptions import SuspiciousOperation
@@ -632,11 +632,14 @@ def handle_remote_node(user, node_data, parent_node):
 
 
 @delay_user_storage_calculation
-def convert_data_to_nodes(user, content_data, parent_node):
+def convert_data_to_nodes(user, content_data, parent_node):  # noqa: C901
     """ Parse dict and create nodes accordingly """
     try:
         root_mapping = {}
         parent_node = ContentNode.objects.get(pk=parent_node)
+        if parent_node.kind_id != content_kinds.TOPIC:
+            raise NodeValidationError("Parent node must be a topic/folder | actual={}".format(parent_node.kind_id))
+
         sort_order = parent_node.children.count() + 1
         existing_node_ids = ContentNode.objects.filter(
             parent_id=parent_node.pk

From b90feb7bba15bd2ac9527956a5d44973dc555374 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Fri, 23 Jun 2023 11:17:54 -0700
Subject: [PATCH 35/63] Skip exercises with missing or broken mastery criteria

---
 .../tests/test_exportchannel.py               | 15 ++++++++++
 .../contentcuration/utils/publish.py          | 28 +++++++++++++++----
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/contentcuration/contentcuration/tests/test_exportchannel.py b/contentcuration/contentcuration/tests/test_exportchannel.py
index c18d9b6fd1..68e5c3c502 100644
--- a/contentcuration/contentcuration/tests/test_exportchannel.py
+++ b/contentcuration/contentcuration/tests/test_exportchannel.py
@@ -117,6 +117,18 @@ def setUp(self):
         new_exercise.complete = True
         new_exercise.parent = current_exercise.parent
         new_exercise.save()
+
+        bad_container = create_node({'kind_id': 'topic', 'title': 'Bad topic container', 'children': []})
+        bad_container.complete = True
+        bad_container.parent = self.content_channel.main_tree
+        bad_container.save()
+
+        # exercise without mastery model, but marked as complete
+        broken_exercise = create_node({'kind_id': 'exercise', 'title': 'Bad mastery test', 'extra_fields': {}})
+        broken_exercise.complete = True
+        broken_exercise.parent = bad_container
+        broken_exercise.save()
+
         thumbnail_data = create_studio_file(thumbnail_bytes, preset="exercise_thumbnail", ext="png")
         file_obj = thumbnail_data["db_file"]
         file_obj.contentnode = new_exercise
@@ -247,6 +259,9 @@ def test_contentnode_incomplete_not_published(self):
         for node in incomplete_nodes:
             assert kolibri_nodes.filter(pk=node.node_id).count() == 0
 
+        # bad exercise node should not be published (technically incomplete)
+        assert kolibri_models.ContentNode.objects.filter(title='Bad mastery test').count() == 0
+
     def test_tags_greater_than_30_excluded(self):
         tag_node = kolibri_models.ContentNode.objects.filter(title='kolibri tag test').first()
         published_tags = tag_node.tags.all()
diff --git a/contentcuration/contentcuration/utils/publish.py b/contentcuration/contentcuration/utils/publish.py
index 9bd4ddb4c9..90d3ef3ccc 100644
--- a/contentcuration/contentcuration/utils/publish.py
+++ b/contentcuration/contentcuration/utils/publish.py
@@ -221,6 +221,17 @@ def recurse_nodes(self, node, inherited_fields):  # noqa C901
 
         # Only process nodes that are either non-topics or have non-topic descendants
         if node.get_descendants(include_self=True).exclude(kind_id=content_kinds.TOPIC).exists() and node.complete:
+            # early validation to make sure we don't have any exercises without mastery models
+            # which should be unlikely when the node is complete, but just in case
+            if node.kind_id == content_kinds.EXERCISE:
+                try:
+                    # migrates and extracts the mastery model from the exercise
+                    _, mastery_model = parse_assessment_metadata(node)
+                    if not mastery_model:
+                        raise ValueError("Exercise does not have a mastery model")
+                except Exception as e:
+                    logging.warning("Unable to parse exercise {id} mastery model: {error}".format(id=node.pk, error=str(e)))
+                    return
 
             metadata = {}
 
@@ -242,12 +253,12 @@ def recurse_nodes(self, node, inherited_fields):  # noqa C901
 
             kolibrinode = create_bare_contentnode(node, self.default_language, self.channel_id, self.channel_name, metadata)
 
-            if node.kind.kind == content_kinds.EXERCISE:
+            if node.kind_id == content_kinds.EXERCISE:
                 exercise_data = process_assessment_metadata(node, kolibrinode)
                 if self.force_exercises or node.changed or not \
                         node.files.filter(preset_id=format_presets.EXERCISE).exists():
                     create_perseus_exercise(node, kolibrinode, exercise_data, user_id=self.user_id)
-            elif node.kind.kind == content_kinds.SLIDESHOW:
+            elif node.kind_id == content_kinds.SLIDESHOW:
                 create_slideshow_manifest(node, user_id=self.user_id)
             elif node.kind_id == content_kinds.TOPIC:
                 for child in node.children.all():
@@ -486,18 +497,23 @@ def create_perseus_exercise(ccnode, kolibrinode, exercise_data, user_id=None):
         temppath and os.unlink(temppath)
 
 
-def process_assessment_metadata(ccnode, kolibrinode):
-    # Get mastery model information, set to default if none provided
-    assessment_items = ccnode.assessment_items.all().order_by('order')
+def parse_assessment_metadata(ccnode):
     extra_fields = ccnode.extra_fields
     if isinstance(extra_fields, basestring):
         extra_fields = json.loads(extra_fields)
     extra_fields = migrate_extra_fields(extra_fields) or {}
     randomize = extra_fields.get('randomize') if extra_fields.get('randomize') is not None else True
+    return randomize, extra_fields.get('options').get('completion_criteria').get('threshold')
+
+
+def process_assessment_metadata(ccnode, kolibrinode):
+    # Get mastery model information, set to default if none provided
+    assessment_items = ccnode.assessment_items.all().order_by('order')
     assessment_item_ids = [a.assessment_id for a in assessment_items]
 
-    exercise_data = deepcopy(extra_fields.get('options').get('completion_criteria').get('threshold'))
+    randomize, mastery_criteria = parse_assessment_metadata(ccnode)
 
+    exercise_data = deepcopy(mastery_criteria)
     exercise_data_type = exercise_data.get('mastery_model', "")
 
     mastery_model = {'type': exercise_data_type or exercises.M_OF_N}

From dfd6536f08e956be5bd725064fd1a610ceeaedbb Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Fri, 23 Jun 2023 11:23:02 -0700
Subject: [PATCH 36/63] Update change tracker to re-raise; update copy
 operation to log exceptions

---
 .../contentcuration/viewsets/base.py          |  1 +
 .../contentcuration/viewsets/contentnode.py   | 23 ++++++++-----------
 .../contentcuration/viewsets/sync/utils.py    | 10 +++++---
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/contentcuration/contentcuration/viewsets/base.py b/contentcuration/contentcuration/viewsets/base.py
index d83b3f9e9a..18e1771de0 100644
--- a/contentcuration/contentcuration/viewsets/base.py
+++ b/contentcuration/contentcuration/viewsets/base.py
@@ -960,6 +960,7 @@ def update_progress(progress=None):
         task_object.status = states.FAILURE
         task_object.traceback = traceback.format_exc()
         task_object.save()
+        raise
     finally:
         if task_object.status == states.STARTED:
             # No error reported, cleanup.
diff --git a/contentcuration/contentcuration/viewsets/contentnode.py b/contentcuration/contentcuration/viewsets/contentnode.py
index ca636c95a4..7366d5f28a 100644
--- a/contentcuration/contentcuration/viewsets/contentnode.py
+++ b/contentcuration/contentcuration/viewsets/contentnode.py
@@ -71,7 +71,7 @@
 from contentcuration.viewsets.sync.constants import CREATED
 from contentcuration.viewsets.sync.constants import DELETED
 from contentcuration.viewsets.sync.utils import generate_update_event
-
+from contentcuration.viewsets.sync.utils import log_sync_exception
 
 channel_query = Channel.objects.filter(main_tree__tree_id=OuterRef("tree_id"))
 
@@ -908,9 +908,11 @@ def copy_from_changes(self, changes):
         for copy in changes:
             # Copy change will have key, must also have other attributes, defined in `copy`
             # Just pass as keyword arguments here to let copy do the validation
-            copy_errors = self.copy(copy["key"], **copy)
-            if copy_errors:
-                copy.update({"errors": copy_errors})
+            try:
+                self.copy(copy["key"], **copy)
+            except Exception as e:
+                log_sync_exception(e, user=self.request.user, change=copy)
+                copy["errors"] = [str(e)]
                 errors.append(copy)
         return errors
 
@@ -924,23 +926,18 @@ def copy(
         excluded_descendants=None,
         **kwargs
     ):
-        try:
-            target, position = self.validate_targeting_args(target, position)
-        except ValidationError as e:
-            return str(e)
+        target, position = self.validate_targeting_args(target, position)
 
         try:
             source = self.get_queryset().get(pk=from_key)
         except ContentNode.DoesNotExist:
-            error = ValidationError("Copy source node does not exist")
-            return str(error)
+            raise ValidationError("Copy source node does not exist")
 
         # Affected channel for the copy is the target's channel
         channel_id = target.channel_id
 
         if ContentNode.filter_by_pk(pk=pk).exists():
-            error = ValidationError("Copy pk already exists")
-            return str(error)
+            raise ValidationError("Copy pk already exists")
 
         can_edit_source_channel = ContentNode.filter_edit_queryset(
             ContentNode.filter_by_pk(pk=source.id), user=self.request.user
@@ -969,8 +966,6 @@ def copy(
                 created_by_id=self.request.user.id,
             )
 
-        return None
-
     def perform_create(self, serializer, change=None):
         instance = serializer.save()
 
diff --git a/contentcuration/contentcuration/viewsets/sync/utils.py b/contentcuration/contentcuration/viewsets/sync/utils.py
index fcfaa8a569..f86b9685d8 100644
--- a/contentcuration/contentcuration/viewsets/sync/utils.py
+++ b/contentcuration/contentcuration/viewsets/sync/utils.py
@@ -1,5 +1,7 @@
 import logging
 
+from django.conf import settings
+
 from contentcuration.utils.sentry import report_exception
 from contentcuration.viewsets.sync.constants import ALL_TABLES
 from contentcuration.viewsets.sync.constants import CHANNEL
@@ -92,7 +94,9 @@ def log_sync_exception(e, user=None, change=None, changes=None):
     elif changes is not None:
         contexts["changes"] = changes
 
-    report_exception(e, user=user, contexts=contexts)
+    # in production, we'll get duplicates in Sentry if we log the exception here.
+    if settings.DEBUG:
+        # make sure we leave a record in the logs just in case.
+        logging.exception(e)
 
-    # make sure we leave a record in the logs just in case.
-    logging.exception(e)
+    report_exception(e, user=user, contexts=contexts)

From 5525b864e72b29dcba8f4e8c105a7005fb2116c4 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Fri, 23 Jun 2023 12:09:40 -0700
Subject: [PATCH 37/63] Fix broken 'Go to location' link

---
 .../frontend/channelEdit/vuex/contentNode/actions.js      | 5 +++--
 .../channelEdit/vuex/importFromChannels/actions.js        | 1 +
 .../contentcuration/frontend/shared/data/public.js        | 8 +++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
index ea461eb3f1..6e8be7ce6f 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
@@ -40,11 +40,12 @@ export function loadContentNode(context, id) {
  * @param {string} id
  * @param {string} nodeId - Note: this is `node_id` not `id`
  * @param {string} rootId
+ * @param {string} parent - The `id` not `node_id` of the parent
  * @return {Promise<{}>}
  */
-export async function loadPublicContentNode(context, { id, nodeId, rootId }) {
+export async function loadPublicContentNode(context, { id, nodeId, rootId, parent }) {
   const publicNode = await publicApi.getContentNode(nodeId);
-  const localNode = publicApi.convertContentNodeResponse(id, rootId, publicNode);
+  const localNode = publicApi.convertContentNodeResponse(id, rootId, parent, publicNode);
   context.commit('ADD_CONTENTNODE', localNode);
   return localNode;
 }
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js
index f8f883b163..84003a33fe 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/importFromChannels/actions.js
@@ -41,6 +41,7 @@ export async function fetchResourceSearchResults(context, params) {
               id: node.id,
               nodeId: node.node_id,
               rootId: node.root_id,
+              parent: node.parent,
             },
             { root: true }
           )
diff --git a/contentcuration/contentcuration/frontend/shared/data/public.js b/contentcuration/contentcuration/frontend/shared/data/public.js
index eb816f35c9..959d3770a8 100644
--- a/contentcuration/contentcuration/frontend/shared/data/public.js
+++ b/contentcuration/contentcuration/frontend/shared/data/public.js
@@ -43,7 +43,6 @@ const CONTENT_NODE_FIELD_MAP = {
   node_id: 'id',
   content_id: 'content_id',
   channel_id: 'channel_id',
-  parent: 'parent',
   title: 'title',
   description: 'description',
   kind: 'kind',
@@ -108,16 +107,19 @@ const CONTENT_NODE_FIELD_MAP = {
  * Convert a content node from the public API into a content node for the Studio frontend
  * @param {string} id - the actual ID of the node on Studio's side
  * @param {string} root_id - the root content node ID
+ * @param {string} parent - the parent's ID
  * @param {PublicContentNode} publicNode
  * @return {{id}}
  */
-export function convertContentNodeResponse(id, root_id, publicNode) {
+export function convertContentNodeResponse(id, root_id, parent, publicNode) {
   const contentNode = {
     // the public API does not return the actual id, but 'node_id' as the id, so this requires
     // us to know what the actual id is
     id,
     // The public API returns the channel ID as the root_id
     root_id,
+    // the public API does not return the actual id, but 'node_id' as the id
+    parent,
   };
 
   // Convert the response node into a content node
@@ -130,7 +132,7 @@ export function convertContentNodeResponse(id, root_id, publicNode) {
   }
 
   // If the parent is the channel, then set the parent to the root_id
-  if (contentNode.parent === contentNode.channel_id) {
+  if (publicNode.parent === publicNode.channel_id) {
     contentNode.parent = root_id;
   }
   return contentNode;

From 9b2aff06bcdb3156f4c600560ab9f3f642894042 Mon Sep 17 00:00:00 2001
From: Samson Akol <akolson2010@gmail.com>
Date: Fri, 16 Jun 2023 23:15:20 +0300
Subject: [PATCH 38/63] Adds defensive check to prevent failing drops

---
 .../channelEdit/views/CurrentTopicView.vue    | 62 ++++++++++---------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
index cbf4f730fa..f72902ca68 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
@@ -545,38 +545,40 @@
           position,
         };
 
-        // When the source region is the clipboard, we want to make sure we use
-        // `excluded_descendants` by accessing the copy trees through the clipboard node ID
-        if (sourceRegion && sourceRegion.id === DraggableRegions.CLIPBOARD) {
-          return Promise.all(
-            data.sources.map(source => {
-              // Using `getCopyTrees` we can access the `excluded_descendants` for the node, such
-              // that we make sure to skip copying nodes that aren't intended to be copied
-              const trees = this.getCopyTrees(source.metadata.clipboardNodeId, true);
+        if (payload.target) {
+          // When the source region is the clipboard, we want to make sure we use
+          // `excluded_descendants` by accessing the copy trees through the clipboard node ID
+          if (sourceRegion && sourceRegion.id === DraggableRegions.CLIPBOARD) {
+            return Promise.all(
+              data.sources.map(source => {
+                // Using `getCopyTrees` we can access the `excluded_descendants` for the node, such
+                // that we make sure to skip copying nodes that aren't intended to be copied
+                const trees = this.getCopyTrees(source.metadata.clipboardNodeId, true);
 
-              // Since we're using `ignoreSelection=true` for `getCopyTrees`, it should only
-              // return one tree at most
-              if (trees.length === 0) {
-                return Promise.resolve();
-              } else if (trees.length > 1) {
-                throw new Error(
-                  'Multiple copy trees are unexpected for drag and drop copy operation'
-                );
-              }
+                // Since we're using `ignoreSelection=true` for `getCopyTrees`, it should only
+                // return one tree at most
+                if (trees.length === 0) {
+                  return Promise.resolve();
+                } else if (trees.length > 1) {
+                  throw new Error(
+                    'Multiple copy trees are unexpected for drag and drop copy operation'
+                  );
+                }
 
-              return this.copyContentNode({
-                ...payload,
-                id: source.metadata.id,
-                excluded_descendants: get(trees, [0, 'extra_fields', 'excluded_descendants'], {}),
-              });
-            })
-          );
-        }
+                return this.copyContentNode({
+                  ...payload,
+                  id: source.metadata.id,
+                  excluded_descendants: get(trees, [0, 'extra_fields', 'excluded_descendants'], {}),
+                });
+              })
+            );
+          }
 
-        return this.moveContentNodes({
-          ...payload,
-          id__in: data.sources.map(s => s.metadata.id),
-        });
+          return this.moveContentNodes({
+            ...payload,
+            id__in: data.sources.map(s => s.metadata.id),
+          });
+        }
       },
       insertPosition(mask) {
         return mask & DraggableFlags.TOP
@@ -724,6 +726,6 @@
 
   .fade-transition-enter-active,
   .fade-transition-leave-active {
-    transition-duration: 0.1s;
+    transition-duration: 0.1s
   }
 </style>

From 730c973554e5488be94858b81591f0bd078463eb Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Mon, 26 Jun 2023 16:54:25 -0700
Subject: [PATCH 39/63] Add ancestor annotation to kolibri_public export
 mapper.

---
 .../kolibri_public/tests/test_mapper.py       |  2 ++
 .../kolibri_public/utils/mapper.py            | 26 ++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/contentcuration/kolibri_public/tests/test_mapper.py b/contentcuration/kolibri_public/tests/test_mapper.py
index 4411032ba4..a10ef159e1 100644
--- a/contentcuration/kolibri_public/tests/test_mapper.py
+++ b/contentcuration/kolibri_public/tests/test_mapper.py
@@ -79,6 +79,8 @@ def _assert_node(self, source, mapped):
         for mapped_tag in mapped.tags.all():
             self.assertEqual(OKAY_TAG, mapped_tag.tag_name)
 
+        self.assertEqual(mapped.ancestors, [{"id": ancestor.id, "title": ancestor.title} for ancestor in source.get_ancestors()])
+
     def _recurse_and_assert(self, sources, mappeds, recursion_depth=0):
         recursion_depths = []
         for source, mapped in zip(sources, mappeds):
diff --git a/contentcuration/kolibri_public/utils/mapper.py b/contentcuration/kolibri_public/utils/mapper.py
index a74f369403..f7605d7e1b 100644
--- a/contentcuration/kolibri_public/utils/mapper.py
+++ b/contentcuration/kolibri_public/utils/mapper.py
@@ -51,6 +51,8 @@ def run(self):
             self.mapped_channel.public = self.public
             self.mapped_channel.save_base(raw=True)
             annotate_label_bitmasks(self.mapped_root.get_descendants(include_self=True))
+            # Rather than set the ancestors fields after mapping, like it is done in Kolibri
+            # here we set it during mapping as we are already recursing through the tree.
             set_channel_metadata_fields(self.mapped_channel.id, public=self.public)
 
     def _map_model(self, source, Model):
@@ -69,22 +71,30 @@ def _map_and_bulk_create_model(self, sources, Model):
 
         Model.objects.bulk_create(cloned_sources, ignore_conflicts=True)
 
-    def _map_node(self, source):
-        return self._map_model(source, kolibri_public_models.ContentNode)
+    def _map_node(self, source, ancestors):
+        node = self._map_model(source, kolibri_public_models.ContentNode)
+        node.ancestors = ancestors
+        return node
+
+    def _extend_ancestors(self, ancestors, new_ancestor):
+        return ancestors + [{"id": new_ancestor.id, "title": new_ancestor.title.replace('"', '\\"')}]
 
     def _recurse_to_create_tree(
         self,
         source,
         nodes_by_parent,
+        ancestors,
     ):
-        nodes_to_create = [self._map_node(source)]
+        nodes_to_create = [self._map_node(source, ancestors)]
 
         if source.kind == content_kinds.TOPIC and source.id in nodes_by_parent:
             children = sorted(nodes_by_parent[source.id], key=lambda x: x.lft)
+            ancestors = self._extend_ancestors(ancestors, source)
             for child in children:
                 nodes_to_create.extend(self._recurse_to_create_tree(
                     child,
                     nodes_by_parent,
+                    ancestors,
                 ))
         return nodes_to_create
 
@@ -110,6 +120,7 @@ def _map(
         self,
         node,
         batch_size,
+        ancestors=[],
         progress_tracker=None,
     ):
         """
@@ -118,13 +129,16 @@ def _map(
         if node.rght - node.lft < batch_size:
             copied_nodes = self._deep_map(
                 node,
+                ancestors,
             )
             if progress_tracker:
                 progress_tracker.increment(len(copied_nodes))
             return copied_nodes
         node_copy = self._shallow_map(
             node,
+            ancestors,
         )
+        ancestors = self._extend_ancestors(ancestors, node)
         if progress_tracker:
             progress_tracker.increment()
         children = node.get_children().order_by("lft")
@@ -132,6 +146,7 @@ def _map(
             self._map(
                 child,
                 batch_size,
+                ancestors=ancestors,
                 progress_tracker=progress_tracker,
             )
         return [node_copy]
@@ -189,8 +204,9 @@ def _copy_associated_objects(self, nodes):
     def _shallow_map(
         self,
         node,
+        ancestors,
     ):
-        mapped_node = self._map_node(node)
+        mapped_node = self._map_node(node, ancestors)
 
         mapped_node.save_base(raw=True)
 
@@ -200,6 +216,7 @@ def _shallow_map(
     def _deep_map(
         self,
         node,
+        ancestors,
     ):
         source_nodes = node.get_descendants(include_self=True)
 
@@ -212,6 +229,7 @@ def _deep_map(
         nodes_to_create = self._recurse_to_create_tree(
             node,
             nodes_by_parent,
+            ancestors,
         )
 
         mapped_nodes = kolibri_public_models.ContentNode.objects.bulk_create(nodes_to_create)

From 87e988a9eef1d1374aa441cd45a70e8db42d0227 Mon Sep 17 00:00:00 2001
From: Marcella Maki <marcellamaki@gmail.com>
Date: Sun, 2 Jul 2023 17:24:48 -0400
Subject: [PATCH 40/63] Refactor the default completion and duration content
 completion options to be in utils.js, and make the default data visible in
 the resource panel

---
 .../channelEdit/components/ResourcePanel.vue  |  15 ++-
 .../components/edit/CompletionOptions.vue     |  59 ++--------
 .../frontend/channelEdit/utils.js             | 101 +++++++++++++++++-
 3 files changed, 118 insertions(+), 57 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
index 8046b9b591..5e249c1556 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
@@ -532,7 +532,12 @@
   import sortBy from 'lodash/sortBy';
   import { mapActions, mapGetters } from 'vuex';
   import camelCase from 'lodash/camelCase';
-  import { isImportedContent, importedChannelLink, getCompletionCriteriaLabels } from '../utils';
+  import {
+    isImportedContent,
+    importedChannelLink,
+    getCompletionCriteriaLabels,
+    getAudioVideoDefaultDuration,
+  } from '../utils';
   import FilePreview from '../views/files/FilePreview';
   import { ContentLevels, Categories, AccessibilityCategories } from '../../shared/constants';
   import AssessmentItemPreview from './AssessmentItemPreview/AssessmentItemPreview';
@@ -614,6 +619,9 @@
         return getCompletionCriteriaLabels(this.node).completion;
       },
       duration() {
+        if (this.isAudioVideo) {
+          return getAudioVideoDefaultDuration(this.files);
+        }
         return getCompletionCriteriaLabels(this.node).duration;
       },
       files() {
@@ -665,6 +673,11 @@
       isResource() {
         return !this.isTopic && !this.isExercise;
       },
+      isAudioVideo() {
+        return (
+          this.node.kind === ContentKindsNames.AUDIO || this.node.kind === ContentKindsNames.VIDEO
+        );
+      },
       isImported() {
         return isImportedContent(this.node);
       },
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue
index 6840c106bc..bc16858092 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue
@@ -100,6 +100,12 @@
 <script>
 
   import get from 'lodash/get';
+  import {
+    defaultCompletionCriteriaModels,
+    defaultCompletionCriteriaThresholds,
+    CompletionOptionsDropdownMap,
+    completionCriteriaToDropdownMap,
+  } from '../../utils';
   import MasteryCriteriaMofNFields from './MasteryCriteriaMofNFields';
   import ActivityDuration from './ActivityDuration.vue';
   import MasteryCriteriaGoal from './MasteryCriteriaGoal';
@@ -125,59 +131,6 @@
   const DEFAULT_SHORT_ACTIVITY = 600;
   const DEFAULT_LONG_ACTIVITY = 3000;
 
-  const defaultCompletionCriteriaModels = {
-    [ContentKindsNames.VIDEO]: CompletionCriteriaModels.TIME,
-    [ContentKindsNames.AUDIO]: CompletionCriteriaModels.TIME,
-    [ContentKindsNames.DOCUMENT]: CompletionCriteriaModels.PAGES,
-    [ContentKindsNames.H5P]: CompletionCriteriaModels.DETERMINED_BY_RESOURCE,
-    [ContentKindsNames.HTML5]: CompletionCriteriaModels.APPROX_TIME,
-    [ContentKindsNames.EXERCISE]: CompletionCriteriaModels.MASTERY,
-  };
-
-  const defaultCompletionCriteriaThresholds = {
-    // Audio and Video threshold defaults are dynamic based
-    // on the duration of the file itself.
-    [ContentKindsNames.DOCUMENT]: '100%',
-    [ContentKindsNames.HTML5]: 300,
-    // We cannot set an automatic default threshold for exercises.
-  };
-
-  const completionCriteriaToDropdownMap = {
-    [CompletionCriteriaModels.TIME]: CompletionDropdownMap.completeDuration,
-    [CompletionCriteriaModels.APPROX_TIME]: CompletionDropdownMap.completeDuration,
-    [CompletionCriteriaModels.PAGES]: CompletionDropdownMap.allContent,
-    [CompletionCriteriaModels.DETERMINED_BY_RESOURCE]: CompletionDropdownMap.determinedByResource,
-    [CompletionCriteriaModels.MASTERY]: CompletionDropdownMap.goal,
-    [CompletionCriteriaModels.REFERENCE]: CompletionDropdownMap.reference,
-  };
-
-  const CompletionOptionsDropdownMap = {
-    [ContentKindsNames.DOCUMENT]: [
-      CompletionDropdownMap.allContent,
-      CompletionDropdownMap.completeDuration,
-      CompletionDropdownMap.reference,
-    ],
-    [ContentKindsNames.EXERCISE]: [CompletionDropdownMap.goal, CompletionDropdownMap.practiceQuiz],
-    [ContentKindsNames.HTML5]: [
-      CompletionDropdownMap.completeDuration,
-      CompletionDropdownMap.determinedByResource,
-      CompletionDropdownMap.reference,
-    ],
-    [ContentKindsNames.H5P]: [
-      CompletionDropdownMap.determinedByResource,
-      CompletionDropdownMap.completeDuration,
-      CompletionDropdownMap.reference,
-    ],
-    [ContentKindsNames.VIDEO]: [
-      CompletionDropdownMap.completeDuration,
-      CompletionDropdownMap.reference,
-    ],
-    [ContentKindsNames.AUDIO]: [
-      CompletionDropdownMap.completeDuration,
-      CompletionDropdownMap.reference,
-    ],
-  };
-
   export default {
     name: 'CompletionOptions',
     components: {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/utils.js b/contentcuration/contentcuration/frontend/channelEdit/utils.js
index a475d4e67f..3a275a7362 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/utils.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/utils.js
@@ -1,13 +1,73 @@
 import translator from './translator';
 import { RouteNames } from './constants';
+import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 import { MasteryModelsNames } from 'shared/leUtils/MasteryModels';
 import { metadataStrings, constantStrings } from 'shared/mixins';
 import {
   AssessmentItemTypes,
   CompletionCriteriaModels,
   SHORT_LONG_ACTIVITY_MIDPOINT,
+  CompletionDropdownMap,
 } from 'shared/constants';
 
+// The constant mapping below is used to set
+// default completion criteria and durations
+// both as initial values in the edit modal, and
+// to ensure backwards compatibility for contentnodes
+// that were added before this was in place
+export const defaultCompletionCriteriaModels = {
+  [ContentKindsNames.VIDEO]: CompletionCriteriaModels.TIME,
+  [ContentKindsNames.AUDIO]: CompletionCriteriaModels.TIME,
+  [ContentKindsNames.DOCUMENT]: CompletionCriteriaModels.PAGES,
+  [ContentKindsNames.H5P]: CompletionCriteriaModels.DETERMINED_BY_RESOURCE,
+  [ContentKindsNames.HTML5]: CompletionCriteriaModels.APPROX_TIME,
+  [ContentKindsNames.EXERCISE]: CompletionCriteriaModels.MASTERY,
+};
+
+export const defaultCompletionCriteriaThresholds = {
+  // Audio and Video threshold defaults are dynamic based
+  // on the duration of the file itself.
+  [ContentKindsNames.DOCUMENT]: '100%',
+  [ContentKindsNames.HTML5]: 300,
+  // We cannot set an automatic default threshold for exercises.
+};
+
+export const completionCriteriaToDropdownMap = {
+  [CompletionCriteriaModels.TIME]: CompletionDropdownMap.completeDuration,
+  [CompletionCriteriaModels.APPROX_TIME]: CompletionDropdownMap.completeDuration,
+  [CompletionCriteriaModels.PAGES]: CompletionDropdownMap.allContent,
+  [CompletionCriteriaModels.DETERMINED_BY_RESOURCE]: CompletionDropdownMap.determinedByResource,
+  [CompletionCriteriaModels.MASTERY]: CompletionDropdownMap.goal,
+  [CompletionCriteriaModels.REFERENCE]: CompletionDropdownMap.reference,
+};
+
+export const CompletionOptionsDropdownMap = {
+  [ContentKindsNames.DOCUMENT]: [
+    CompletionDropdownMap.allContent,
+    CompletionDropdownMap.completeDuration,
+    CompletionDropdownMap.reference,
+  ],
+  [ContentKindsNames.EXERCISE]: [CompletionDropdownMap.goal, CompletionDropdownMap.practiceQuiz],
+  [ContentKindsNames.HTML5]: [
+    CompletionDropdownMap.completeDuration,
+    CompletionDropdownMap.determinedByResource,
+    CompletionDropdownMap.reference,
+  ],
+  [ContentKindsNames.H5P]: [
+    CompletionDropdownMap.determinedByResource,
+    CompletionDropdownMap.completeDuration,
+    CompletionDropdownMap.reference,
+  ],
+  [ContentKindsNames.VIDEO]: [
+    CompletionDropdownMap.completeDuration,
+    CompletionDropdownMap.reference,
+  ],
+  [ContentKindsNames.AUDIO]: [
+    CompletionDropdownMap.completeDuration,
+    CompletionDropdownMap.reference,
+  ],
+};
+
 /**
  * Get correct answer index/indices out of an array of answer objects.
  * @param {String} questionType single/multiple selection, true/false, input question
@@ -178,6 +238,36 @@ export function secondsToHms(seconds) {
   return hms;
 }
 
+/**
+ * Set a default completion model for audiovisual content
+ * equal to the file length in seconds (parsed), or a fallback placeholder
+ *
+ * @param {Object} node
+ * @returns {String|Number} {from options in the map above}
+ */
+export function getAudioVideoDefaultDuration(files) {
+  return files && files[0] ? secondsToHms(files[0].duration) : '-';
+}
+
+export function generateDefaultThreshold(node) {
+  if (node.kind !== ContentKindsNames.AUDIO || node.kind !== ContentKindsNames.VIDEO) {
+    return defaultCompletionCriteriaThresholds[node.kind];
+  }
+}
+
+/**
+ * Set a default completion model for non-audiovisual content
+ * the default completion for audio video is the duration of the file length
+ *
+ * @param {Object} node
+ * @returns {String|Number} {from options in the map above}
+ */
+export function generateDefaultModel(node) {
+  if (node.kind !== ContentKindsNames.AUDIO || node.kind !== ContentKindsNames.VIDEO) {
+    return defaultCompletionCriteriaThresholds[node.kind];
+  }
+}
+
 /**
  * Gathers data from a content node related to its completion.
  *
@@ -190,15 +280,18 @@ export function getCompletionDataFromNode(node) {
     return;
   }
 
-  const { model, threshold } = node.extra_fields?.options?.completion_criteria || {};
-  const masteryModel = threshold?.mastery_model;
+  const completionCriteria = node.extra_fields?.options?.completion_criteria
+    ? JSON.parse(JSON.stringify(node.extra_fields?.options?.completion_criteria))
+    : null;
+  const threshold = completionCriteria?.threshold || generateDefaultThreshold(node);
+  const model = completionCriteria?.model || defaultCompletionCriteriaModels[node.kind];
   const suggestedDurationType = node.extra_fields?.suggested_duration_type;
   const suggestedDuration = node.suggested_duration;
 
   return {
     completionModel: model,
     completionThreshold: threshold,
-    masteryModel,
+    masteryModel: threshold?.mastery_model,
     suggestedDurationType,
     suggestedDuration,
   };
@@ -252,6 +345,8 @@ export function getCompletionCriteriaLabels(node) {
       labels.completion = metadataStrings.$tr('completeDuration');
       if (suggestedDuration) {
         labels.duration = secondsToHms(suggestedDuration);
+      } else {
+        getAudioVideoDefaultDuration(node);
       }
       break;
 

From b6e295fe4c6bad28f66b9f6114ca20cb8990f894 Mon Sep 17 00:00:00 2001
From: Marcella Maki <marcellamaki@gmail.com>
Date: Mon, 3 Jul 2023 16:41:05 -0400
Subject: [PATCH 41/63] Add tests, PR feedback

---
 .../channelEdit/__tests__/utils.spec.js       | 71 +++++++++++++++++++
 .../channelEdit/components/ResourcePanel.vue  | 17 +----
 .../frontend/channelEdit/utils.js             | 34 +++++----
 3 files changed, 89 insertions(+), 33 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/__tests__/utils.spec.js b/contentcuration/contentcuration/frontend/channelEdit/__tests__/utils.spec.js
index 1ea5215eb8..ac4ef7539e 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/__tests__/utils.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/__tests__/utils.spec.js
@@ -8,6 +8,7 @@ import {
   importedChannelLink,
   secondsToHms,
   getCompletionCriteriaLabels,
+  getCompletionDataFromNode,
 } from '../utils';
 import router from '../router';
 import { RouteNames } from '../constants';
@@ -475,6 +476,76 @@ describe('channelEdit utils', () => {
   });
 
   describe(`getCompletionCriteriaLabels`, () => {
+    describe(`setting default values for completion and duration`, () => {
+      describe(`for audio and video content`, () => {
+        it(`returns 'When time spent is equal to duration' completion label and  duration label equal to the file length in hh:mm:ss format`, () => {
+          expect(
+            getCompletionCriteriaLabels(
+              {
+                extra_fields: {
+                  options: {},
+                },
+                kind: 'audio',
+              },
+              [{ duration: 100 }]
+            )
+          ).toEqual({
+            completion: 'When time spent is equal to duration',
+            duration: '01:40',
+          });
+        });
+        it(`returns 'When time spent is equal to duration' completion label and  duration label equal to the file length in hh:mm:ss format`, () => {
+          expect(
+            getCompletionCriteriaLabels(
+              {
+                extra_fields: {
+                  options: {},
+                },
+                kind: 'video',
+              },
+              [{ duration: 100 }]
+            )
+          ).toEqual({
+            completion: 'When time spent is equal to duration',
+            duration: '01:40',
+          });
+        });
+      });
+      describe(`for documents`, () => {
+        it(`returns 'Viewed in its entirety' completion label and empty duration label`, () => {
+          expect(
+            getCompletionCriteriaLabels(
+              {
+                extra_fields: {
+                  options: {},
+                },
+                kind: 'document',
+              },
+              []
+            )
+          ).toEqual({
+            completion: 'Viewed in its entirety',
+            duration: '-',
+          });
+        });
+      });
+      describe(`for exercises`, () => {
+        it(`sets the Completion Criteria model to 'mastery'`, () => {
+          expect(
+            getCompletionDataFromNode(
+              {
+                extra_fields: {
+                  options: {},
+                },
+                kind: 'exercise',
+              },
+              []
+            ).completionModel
+          ).toEqual('mastery');
+        });
+      });
+    });
+
     describe(`for 'reference' completion criteria`, () => {
       it(`returns 'Reference material' completion label and empty duration label`, () => {
         expect(
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
index 5e249c1556..bd62bea98b 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
@@ -532,12 +532,7 @@
   import sortBy from 'lodash/sortBy';
   import { mapActions, mapGetters } from 'vuex';
   import camelCase from 'lodash/camelCase';
-  import {
-    isImportedContent,
-    importedChannelLink,
-    getCompletionCriteriaLabels,
-    getAudioVideoDefaultDuration,
-  } from '../utils';
+  import { isImportedContent, importedChannelLink, getCompletionCriteriaLabels } from '../utils';
   import FilePreview from '../views/files/FilePreview';
   import { ContentLevels, Categories, AccessibilityCategories } from '../../shared/constants';
   import AssessmentItemPreview from './AssessmentItemPreview/AssessmentItemPreview';
@@ -619,10 +614,7 @@
         return getCompletionCriteriaLabels(this.node).completion;
       },
       duration() {
-        if (this.isAudioVideo) {
-          return getAudioVideoDefaultDuration(this.files);
-        }
-        return getCompletionCriteriaLabels(this.node).duration;
+        return getCompletionCriteriaLabels(this.node, this.files).duration;
       },
       files() {
         return sortBy(this.getContentNodeFiles(this.nodeId), f => f.preset.order);
@@ -673,11 +665,6 @@
       isResource() {
         return !this.isTopic && !this.isExercise;
       },
-      isAudioVideo() {
-        return (
-          this.node.kind === ContentKindsNames.AUDIO || this.node.kind === ContentKindsNames.VIDEO
-        );
-      },
       isImported() {
         return isImportedContent(this.node);
       },
diff --git a/contentcuration/contentcuration/frontend/channelEdit/utils.js b/contentcuration/contentcuration/frontend/channelEdit/utils.js
index 3a275a7362..30ad2196b5 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/utils.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/utils.js
@@ -239,30 +239,24 @@ export function secondsToHms(seconds) {
 }
 
 /**
- * Set a default completion model for audiovisual content
+ * Set a default duration for audiovisual content
  * equal to the file length in seconds (parsed), or a fallback placeholder
  *
- * @param {Object} node
- * @returns {String|Number} {from options in the map above}
+ * @param {Array} files
+ * @returns {String|Number} {human-readable duration}
  */
 export function getAudioVideoDefaultDuration(files) {
   return files && files[0] ? secondsToHms(files[0].duration) : '-';
 }
 
-export function generateDefaultThreshold(node) {
-  if (node.kind !== ContentKindsNames.AUDIO || node.kind !== ContentKindsNames.VIDEO) {
-    return defaultCompletionCriteriaThresholds[node.kind];
-  }
-}
-
 /**
- * Set a default completion model for non-audiovisual content
- * the default completion for audio video is the duration of the file length
+ * Set a default completion threshold for audiovisual content
+ * equal to the file's duration
  *
  * @param {Object} node
- * @returns {String|Number} {from options in the map above}
+ * @returns {String|Number} {human-readable threshold}
  */
-export function generateDefaultModel(node) {
+export function generateDefaultThreshold(node) {
   if (node.kind !== ContentKindsNames.AUDIO || node.kind !== ContentKindsNames.VIDEO) {
     return defaultCompletionCriteriaThresholds[node.kind];
   }
@@ -319,8 +313,10 @@ export function isLongActivity(node) {
  * @param {Object} node
  * @returns {Object} { completion, duration }
  */
-export function getCompletionCriteriaLabels(node) {
-  if (!node) {
+export function getCompletionCriteriaLabels(node = {}, files = []) {
+  console.log('labels');
+  if (!node && !files) {
+    console.log('none');
     return;
   }
 
@@ -336,6 +332,8 @@ export function getCompletionCriteriaLabels(node) {
     duration: '-',
   };
 
+  console.log('filesss', files);
+
   switch (completionModel) {
     case CompletionCriteriaModels.REFERENCE:
       labels.completion = metadataStrings.$tr('reference');
@@ -343,10 +341,10 @@ export function getCompletionCriteriaLabels(node) {
 
     case CompletionCriteriaModels.TIME:
       labels.completion = metadataStrings.$tr('completeDuration');
-      if (suggestedDuration) {
+      if (node.kind === ContentKindsNames.AUDIO || node.kind === ContentKindsNames.VIDEO) {
+        labels.duration = getAudioVideoDefaultDuration(files);
+      } else if (suggestedDuration) {
         labels.duration = secondsToHms(suggestedDuration);
-      } else {
-        getAudioVideoDefaultDuration(node);
       }
       break;
 

From a47d924feb79abd940c96d643d572cf6519d70e0 Mon Sep 17 00:00:00 2001
From: Marcella Maki <marcellamaki@gmail.com>
Date: Tue, 4 Jul 2023 08:36:35 -0400
Subject: [PATCH 42/63] remove stray logs

---
 contentcuration/contentcuration/frontend/channelEdit/utils.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/utils.js b/contentcuration/contentcuration/frontend/channelEdit/utils.js
index 30ad2196b5..15ae9413a5 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/utils.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/utils.js
@@ -314,9 +314,7 @@ export function isLongActivity(node) {
  * @returns {Object} { completion, duration }
  */
 export function getCompletionCriteriaLabels(node = {}, files = []) {
-  console.log('labels');
   if (!node && !files) {
-    console.log('none');
     return;
   }
 
@@ -332,8 +330,6 @@ export function getCompletionCriteriaLabels(node = {}, files = []) {
     duration: '-',
   };
 
-  console.log('filesss', files);
-
   switch (completionModel) {
     case CompletionCriteriaModels.REFERENCE:
       labels.completion = metadataStrings.$tr('reference');

From 51b61bdea20dd3841297ad6701e05311e11966a9 Mon Sep 17 00:00:00 2001
From: Samson Akol <akolson2010@gmail.com>
Date: Wed, 5 Jul 2023 23:25:47 +0300
Subject: [PATCH 43/63] Prevent source edits for copied/imported resources

---
 .../channelEdit/components/edit/DetailsTabView.vue  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
index 526de211bd..422fd1c4bc 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
@@ -246,7 +246,7 @@
               ref="author"
               :items="authors"
               :label="$tr('authorLabel')"
-              :readonly="disableAuthEdits"
+              :readonly="disableSourceEdits"
               maxlength="200"
               counter
               autoSelectFirst
@@ -267,7 +267,7 @@
               ref="provider"
               :items="providers"
               :label="$tr('providerLabel')"
-              :readonly="disableAuthEdits"
+              :readonly="disableSourceEdits"
               maxlength="200"
               counter
               :placeholder="getPlaceholder('provider')"
@@ -288,7 +288,7 @@
               ref="aggregator"
               :items="aggregators"
               :label="$tr('aggregatorLabel')"
-              :readonly="disableAuthEdits"
+              :readonly="disableSourceEdits"
               maxlength="200"
               counter
               autoSelectFirst
@@ -309,7 +309,7 @@
               ref="license"
               v-model="licenseItem"
               :required="isUnique(license) && isUnique(license_description) && !disableAuthEdits"
-              :readonly="disableAuthEdits"
+              :readonly="disableSourceEdits"
               :placeholder="getPlaceholder('license')"
               :descriptionPlaceholder="getPlaceholder('license_description')"
               @focus="trackClick('License')"
@@ -328,7 +328,7 @@
               :rules="copyrightHolderRules"
               :placeholder="getPlaceholder('copyright_holder')"
               autoSelectFirst
-              :readonly="disableAuthEdits"
+              :readonly="disableSourceEdits"
               box
               :value="copyright_holder && copyright_holder.toString()"
               @input.native="(e) => (copyright_holder = e.srcElement.value)"
@@ -658,6 +658,9 @@
       disableAuthEdits() {
         return this.nodes.some(node => node.freeze_authoring_data);
       },
+      disableSourceEdits() {
+        return this.disableAuthEdits || this.isImported;
+      },
       detectedImportText() {
         const count = this.nodes.filter(node => node.freeze_authoring_data).length;
         return this.$tr('detectedImportText', { count });

From aeb0c2e54805cfdd4f0d7604771483cd4e0e4047 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Jul 2023 21:44:23 +0000
Subject: [PATCH 44/63] Bump grpcio from 1.51.1 to 1.53.0

Bumps [grpcio](https://github.com/grpc/grpc) from 1.51.1 to 1.53.0.
- [Release notes](https://github.com/grpc/grpc/releases)
- [Changelog](https://github.com/grpc/grpc/blob/master/doc/grpc_release_schedule.md)
- [Commits](https://github.com/grpc/grpc/compare/v1.51.1...v1.53.0)

---
updated-dependencies:
- dependency-name: grpcio
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 3f52a3d368..9b49b26575 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -139,7 +139,7 @@ googleapis-common-protos[grpc]==1.57.0
     #   grpc-google-iam-v1
 grpc-google-iam-v1==0.12.4
     # via google-cloud-kms
-grpcio==1.51.1
+grpcio==1.53.0
     # via
     #   google-api-core
     #   googleapis-common-protos

From 80d33c696a17c170816f806f03a9ef3c4b532eec Mon Sep 17 00:00:00 2001
From: Vivek Agrawal <vivekmittalagrawal@gmail.com>
Date: Thu, 6 Jul 2023 18:26:31 +0530
Subject: [PATCH 45/63] Fix language ignorance for public API

---
 contentcuration/contentcuration/middleware/locale.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contentcuration/contentcuration/middleware/locale.py b/contentcuration/contentcuration/middleware/locale.py
index 5d526f3b8b..965312c0fa 100644
--- a/contentcuration/contentcuration/middleware/locale.py
+++ b/contentcuration/contentcuration/middleware/locale.py
@@ -1,4 +1,6 @@
+from django.conf import settings
 from django.middleware.locale import LocaleMiddleware
+from django.utils import translation
 
 LOCALE_EXEMPT = "_locale_exempt"
 
@@ -15,6 +17,8 @@ def _is_exempt(self, obj):
     def process_view(self, request, callback, callback_args, callback_kwargs):
         if self._is_exempt(callback):
             setattr(request, LOCALE_EXEMPT, True)
+            translation.activate(settings.LANGUAGE_CODE)
+            request.LANGUAGE_CODE = translation.get_language()
         return None
 
     def process_response(self, request, response):

From 355eca91745cc6960b53a4ca8339f807fb5ee1c0 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Thu, 6 Jul 2023 07:07:01 -0700
Subject: [PATCH 46/63] [#4193][#4194] Apply defaults to details to avoid
 undefined errors

---
 .../frontend/shared/views/details/Details.vue | 117 ++++++++++++------
 1 file changed, 79 insertions(+), 38 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/shared/views/details/Details.vue b/contentcuration/contentcuration/frontend/shared/views/details/Details.vue
index ce5397a624..b2f0d0bda3 100644
--- a/contentcuration/contentcuration/frontend/shared/views/details/Details.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/details/Details.vue
@@ -3,50 +3,50 @@
   <div :class="{ printing }">
     <div style="max-width: 300px">
       <Thumbnail
-        :src="isChannel ? details.thumbnail_url : details.thumbnail_src"
-        :encoding="isChannel ? details.thumbnail_encoding : null"
+        :src="isChannel ? _details.thumbnail_url : _details.thumbnail_src"
+        :encoding="isChannel ? _details.thumbnail_encoding : null"
       />
     </div>
     <br>
     <h1 class="notranslate" dir="auto">
-      {{ isChannel ? details.name : details.title }}
+      {{ isChannel ? _details.name : _details.title }}
     </h1>
     <p class="notranslate" dir="auto">
-      {{ details.description }}
+      {{ _details.description }}
     </p>
     <br>
 
     <template v-if="isChannel">
-      <DetailsRow v-if="details.published && details.primary_token" :label="$tr('tokenHeading')">
+      <DetailsRow v-if="_details.published && _details.primary_token" :label="$tr('tokenHeading')">
         <template #default>
           <CopyToken
             v-if="!printing"
-            :token="details.primary_token"
+            :token="_details.primary_token"
             style="max-width:max-content;"
           />
           <span v-else>
             {{
-              details.primary_token.slice(0, 5) + '-' + details.primary_token.slice(5)
+              _details.primary_token.slice(0, 5) + '-' + _details.primary_token.slice(5)
             }}
           </span>
         </template>
       </DetailsRow>
       <DetailsRow :label="$tr('publishedHeading')">
-        <span v-if="details.published">{{ publishedDate }}</span>
+        <span v-if="_details.published">{{ publishedDate }}</span>
         <em v-else>{{ $tr('unpublishedText') }}</em>
       </DetailsRow>
       <DetailsRow :label="$tr('currentVersionHeading')">
-        <template v-if="details.published">
-          {{ details.version }}
+        <template v-if="_details.published">
+          {{ _details.version }}
         </template>
         <template v-else>
           {{ defaultText }}
         </template>
       </DetailsRow>
       <DetailsRow
-        v-if="details.language"
+        v-if="_details.language"
         :label="$tr('primaryLanguageHeading')"
-        :text="translateLanguage(details.language)"
+        :text="translateLanguage(_details.language)"
       />
     </template>
 
@@ -62,7 +62,7 @@
       />
       <DetailsRow :label="$tr('resourceHeading')">
         <template #default>
-          <p>{{ $formatNumber(details.resource_count) }}</p>
+          <p>{{ $formatNumber(_details.resource_count) }}</p>
           <VDataTable
             :items="kindCount"
             hide-actions
@@ -121,13 +121,13 @@
       </DetailsRow>
       <DetailsRow :label="$tr('containsHeading')">
         <template v-if="!printing" #default>
-          <VChip v-if="details.includes.coach_content" class="tag">
+          <VChip v-if="_details.includes.coach_content" class="tag">
             {{ $tr('coachHeading') }}
           </VChip>
-          <VChip v-if="details.includes.exercises" class="tag">
+          <VChip v-if="_details.includes.exercises" class="tag">
             {{ $tr('assessmentsIncludedText') }}
           </VChip>
-          <div v-if="!details.includes.exercises && !details.includes.coach_content">
+          <div v-if="!_details.includes.exercises && !_details.includes.coach_content">
             {{ defaultText }}
           </div>
         </template>
@@ -137,7 +137,7 @@
       </DetailsRow>
       <DetailsRow
         :label="$tr('coachHeading')"
-        :text="$formatNumber(details.includes.coach_content || 0)"
+        :text="$formatNumber(_details.includes.coach_content)"
         :definition="!printing ? $tr('coachDescription') : ''"
       />
       <DetailsRow :label="$tr('tagsHeading')">
@@ -162,7 +162,7 @@
         <template #default>
           <ExpandableList
             :noItemsText="defaultText"
-            :items="details.languages"
+            :items="_details.languages"
             :printing="printing"
             inline
           />
@@ -172,7 +172,7 @@
         <template #default>
           <ExpandableList
             :noItemsText="defaultText"
-            :items="details.accessible_languages"
+            :items="_details.accessible_languages"
             :printing="printing"
             inline
           />
@@ -186,7 +186,7 @@
         <template #default>
           <ExpandableList
             :noItemsText="defaultText"
-            :items="details.authors"
+            :items="_details.authors"
             :printing="printing"
             inline
           />
@@ -199,7 +199,7 @@
         <template #default>
           <ExpandableList
             :noItemsText="defaultText"
-            :items="details.providers"
+            :items="_details.providers"
             :printing="printing"
             inline
           />
@@ -212,7 +212,7 @@
         <template #default>
           <ExpandableList
             :noItemsText="defaultText"
-            :items="details.aggregators"
+            :items="_details.aggregators"
             :printing="printing"
             inline
           />
@@ -222,7 +222,7 @@
       <DetailsRow :label="$tr('licensesLabel')">
         <template #default>
           <template v-if="!printing">
-            <VTooltip v-for="license in details.licenses" :key="license" top lazy>
+            <VTooltip v-for="license in _details.licenses" :key="license" top lazy>
               <template #activator="{ on }">
                 <VChip class="tag" v-on="on">
                   {{ translateConstant(license) }}
@@ -239,7 +239,7 @@
       <DetailsRow :label="$tr('copyrightHoldersLabel')">
         <template #default>
           <ExpandableList
-            :items="details.copyright_holders"
+            :items="_details.copyright_holders"
             :no-items-text="defaultText"
             :printing="printing"
             inline
@@ -248,12 +248,12 @@
       </DetailsRow>
 
       <DetailsRow
-        v-if="details.original_channels.length"
+        v-if="_details.original_channels.length"
         :label="$tr('containsContentHeading')"
       >
         <template #default>
           <VLayout
-            v-for="channel in details.original_channels"
+            v-for="channel in _details.original_channels"
             :key="channel.id"
             class="preview-row"
             align-center
@@ -279,7 +279,7 @@
       </DetailsRow>
 
       <label
-        v-if="details.sample_nodes.length"
+        v-if="_details.sample_nodes.length"
         class="body-1 font-weight-bold"
         :style="{ color: $vuetify.theme.darkGrey }"
       >
@@ -287,7 +287,7 @@
       </label>
       <VLayout row :wrap="!printing" class="my-4 pt-1 sample-nodes">
         <VFlex
-          v-for="node in details.sample_nodes"
+          v-for="node in _details.sample_nodes"
           :key="node.node_id"
           :xs12="!printing"
           :xs3="printing"
@@ -310,6 +310,8 @@
 
 <script>
 
+  import cloneDeep from 'lodash/cloneDeep';
+  import defaultsDeep from 'lodash/defaultsDeep';
   import camelCase from 'lodash/camelCase';
   import orderBy from 'lodash/orderBy';
   import { SCALE_TEXT, SCALE, CHANNEL_SIZE_DIVISOR } from './constants';
@@ -328,6 +330,39 @@
   import Thumbnail from 'shared/views/files/Thumbnail';
   import CopyToken from 'shared/views/CopyToken';
 
+  const DEFAULT_DETAILS = {
+    name: '',
+    title: '',
+    description: '',
+    thumbnail_url: null,
+    thumbnail_src: null,
+    thumbnail_encoding: null,
+    published: false,
+    version: null,
+    primary_token: null,
+    language: null,
+    last_update: null,
+    created: null,
+    last_published: null,
+    resource_count: 0,
+    resource_size: 0,
+    includes: { coach_content: 0, exercises: 0 },
+    kind_count: [],
+    languages: [],
+    accessible_languages: [],
+    licenses: [],
+    tags: [],
+    copyright_holders: [],
+    authors: [],
+    aggregators: [],
+    providers: [],
+    sample_pathway: [],
+    original_channels: [],
+    sample_nodes: [],
+    levels: [],
+    categories: [],
+  };
+
   export default {
     name: 'Details',
     components: {
@@ -364,13 +399,19 @@
       },
     },
     computed: {
+      _details() {
+        const details = cloneDeep(this.details);
+        defaultsDeep(details, DEFAULT_DETAILS);
+        details.published = Boolean(details.last_published);
+        return details;
+      },
       defaultText() {
         // Making this a computed property so it's easier to update
         return '---';
       },
       publishedDate() {
         if (this.isChannel) {
-          return this.$formatDate(this.details.last_published, {
+          return this.$formatDate(this._details.last_published, {
             year: 'numeric',
             month: 'long',
             day: 'numeric',
@@ -382,7 +423,7 @@
         return window.libraryMode;
       },
       sizeText() {
-        const size = (this.details && this.details.resource_size) || 0;
+        const size = this._details.resource_size;
         const sizeIndex = Math.max(
           1,
           Math.min(Math.ceil(Math.log(size / CHANNEL_SIZE_DIVISOR) / Math.log(2)), 10)
@@ -393,10 +434,10 @@
         });
       },
       kindCount() {
-        return orderBy(this.details.kind_count, ['count', 'kind_id'], ['desc', 'asc']);
+        return orderBy(this._details.kind_count, ['count', 'kind_id'], ['desc', 'asc']);
       },
       createdDate() {
-        return this.$formatDate(this.details.created, {
+        return this.$formatDate(this._details.created, {
           year: 'numeric',
           month: 'long',
           day: 'numeric',
@@ -406,28 +447,28 @@
         return Object.keys(this.details).length;
       },
       sortedTags() {
-        return orderBy(this.details.tags, ['count'], ['desc']);
+        return orderBy(this._details.tags, ['count'], ['desc']);
       },
       includesPrintable() {
         const includes = [];
-        if (this.details.includes.coach_content) {
+        if (this._details.includes.coach_content) {
           includes.push(this.$tr('coachHeading'));
         }
 
-        if (this.details.includes.exercises) {
+        if (this._details.includes.exercises) {
           includes.push(this.$tr('assessmentsIncludedText'));
         }
 
         return includes.length ? includes.join(', ') : this.defaultText;
       },
       licensesPrintable() {
-        return this.details.licenses.map(this.translateConstant).join(', ');
+        return this._details.licenses.map(this.translateConstant).join(', ');
       },
       tagPrintable() {
         return this.sortedTags.map(tag => tag.tag_name).join(', ');
       },
       levels() {
-        return this.details.levels.map(level => {
+        return this._details.levels.map(level => {
           level = LevelsLookup[level];
           let translationKey;
           if (level === 'PROFESSIONAL') {
@@ -446,7 +487,7 @@
         return this.levels.join(', ');
       },
       categories() {
-        return this.details.categories.map(category => {
+        return this._details.categories.map(category => {
           category = CategoriesLookup[category];
           return this.translateMetadataString(camelCase(category));
         });

From 7d81e1b00167f6a180aed8ba4529f2fb2921512f Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Thu, 6 Jul 2023 07:07:36 -0700
Subject: [PATCH 47/63] [#4195] Defensive check against deleted attr

---
 .../frontend/administration/pages/Channels/ChannelDetails.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue
index a7029e2710..fe7f1fa0db 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue
@@ -19,7 +19,7 @@
     </template>
     <LoadingText v-if="loading" absolute />
     <VCardText v-else>
-      <Banner error :value="channel.deleted" class="mb-4">
+      <Banner error :value="Boolean(channel?.deleted)" class="mb-4">
         This channel has been deleted
       </Banner>
       <VTabsItems v-model="tab">

From 749293509feb30a57f90660c0be1f5193c1d5df8 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Fri, 7 Jul 2023 08:18:45 -0700
Subject: [PATCH 48/63] Create computed prop for deleted

---
 .../administration/pages/Channels/ChannelDetails.vue         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue
index fe7f1fa0db..b867ee36e8 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue
@@ -19,7 +19,7 @@
     </template>
     <LoadingText v-if="loading" absolute />
     <VCardText v-else>
-      <Banner error :value="Boolean(channel?.deleted)" class="mb-4">
+      <Banner error :value="isDeleted" class="mb-4">
         This channel has been deleted
       </Banner>
       <VTabsItems v-model="tab">
@@ -102,6 +102,9 @@
       channel() {
         return this.getChannel(this.channelId);
       },
+      isDeleted() {
+        return this.channel && Boolean(this.channel?.deleted);
+      },
       channelWithDetails() {
         if (!this.channel || !this.details) {
           return {};

From 95f09af081ab08990b66cf109a353d975d469676 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Fri, 7 Jul 2023 09:52:52 -0700
Subject: [PATCH 49/63] [#4200] Defensiveness against ZIM content kind, and
 .icon

---
 .../channelEdit/components/AssessmentItemToolbar.vue        | 2 +-
 .../contentcuration/frontend/channelEdit/utils.js           | 6 ++++++
 .../contentcuration/frontend/shared/constants.js            | 1 +
 .../frontend/shared/views/__tests__/contentNodeIcon.spec.js | 1 +
 .../contentcuration/frontend/shared/vuetify/icons.js        | 1 +
 .../contentcuration/frontend/shared/vuetify/theme.js        | 1 +
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemToolbar.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemToolbar.vue
index 6c37c32c3b..cb04a42302 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemToolbar.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemToolbar.vue
@@ -15,7 +15,7 @@
             v-on="on"
             @click="clickItem(action)"
           >
-            <Icon :color="iconColor(action)">
+            <Icon v-if="config[action] && config[action].icon" :color="iconColor(action)">
               {{ config[action].icon }}
             </Icon>
           </VBtn>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/utils.js b/contentcuration/contentcuration/frontend/channelEdit/utils.js
index 15ae9413a5..97dd9d4713 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/utils.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/utils.js
@@ -21,6 +21,7 @@ export const defaultCompletionCriteriaModels = {
   [ContentKindsNames.DOCUMENT]: CompletionCriteriaModels.PAGES,
   [ContentKindsNames.H5P]: CompletionCriteriaModels.DETERMINED_BY_RESOURCE,
   [ContentKindsNames.HTML5]: CompletionCriteriaModels.APPROX_TIME,
+  [ContentKindsNames.ZIM]: CompletionCriteriaModels.APPROX_TIME,
   [ContentKindsNames.EXERCISE]: CompletionCriteriaModels.MASTERY,
 };
 
@@ -53,6 +54,11 @@ export const CompletionOptionsDropdownMap = {
     CompletionDropdownMap.determinedByResource,
     CompletionDropdownMap.reference,
   ],
+  [ContentKindsNames.ZIM]: [
+    CompletionDropdownMap.completeDuration,
+    CompletionDropdownMap.determinedByResource,
+    CompletionDropdownMap.reference,
+  ],
   [ContentKindsNames.H5P]: [
     CompletionDropdownMap.determinedByResource,
     CompletionDropdownMap.completeDuration,
diff --git a/contentcuration/contentcuration/frontend/shared/constants.js b/contentcuration/contentcuration/frontend/shared/constants.js
index fb802c47b3..0239603c59 100644
--- a/contentcuration/contentcuration/frontend/shared/constants.js
+++ b/contentcuration/contentcuration/frontend/shared/constants.js
@@ -63,6 +63,7 @@ export const kindToIconMap = {
   slideshow: 'photo_library',
   topic: 'folder',
   video: 'theaters',
+  zim: 'widgets',
 };
 
 export const SharingPermissions = {
diff --git a/contentcuration/contentcuration/frontend/shared/views/__tests__/contentNodeIcon.spec.js b/contentcuration/contentcuration/frontend/shared/views/__tests__/contentNodeIcon.spec.js
index d353221ec1..0c18f65fd4 100644
--- a/contentcuration/contentcuration/frontend/shared/views/__tests__/contentNodeIcon.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/__tests__/contentNodeIcon.spec.js
@@ -24,6 +24,7 @@ describe('ContentNodeIcon', () => {
     { value: 'exercise', icon: 'assignment' },
     { value: 'document', icon: 'class' },
     { value: 'html5', icon: 'widgets' },
+    { value: 'zim', icon: 'widgets' },
   ];
   it.each(testIcons)('should display the correct icon $value', kind => {
     const wrapper = makeWrapper(kind.value);
diff --git a/contentcuration/contentcuration/frontend/shared/vuetify/icons.js b/contentcuration/contentcuration/frontend/shared/vuetify/icons.js
index b119d983fa..fa0ce43e61 100644
--- a/contentcuration/contentcuration/frontend/shared/vuetify/icons.js
+++ b/contentcuration/contentcuration/frontend/shared/vuetify/icons.js
@@ -20,6 +20,7 @@ export const CONTENT_KIND_ICONS = {
   [ContentKindsNames.EXERCISE]: 'assignment',
   [ContentKindsNames.DOCUMENT]: 'class',
   [ContentKindsNames.HTML5]: 'widgets',
+  [ContentKindsNames.ZIM]: 'widgets',
 };
 
 export function getContentKindIcon(kind, isEmpty = false) {
diff --git a/contentcuration/contentcuration/frontend/shared/vuetify/theme.js b/contentcuration/contentcuration/frontend/shared/vuetify/theme.js
index 6ea2a7ca5c..a23e99dd25 100644
--- a/contentcuration/contentcuration/frontend/shared/vuetify/theme.js
+++ b/contentcuration/contentcuration/frontend/shared/vuetify/theme.js
@@ -21,6 +21,7 @@ export default function theme() {
       document: '#ff3d00',
       exercise: '#4db6ac',
       html5: '#ff8f00',
+      zim: '#ff8f00',
       slideshow: '#4ece90',
       channelHighlightDefault: colors.grey.lighten3,
       draggableDropZone: '#dddddd',

From 07a4e374357262145f134f126265fa8e9860b158 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Fri, 7 Jul 2023 10:18:15 -0700
Subject: [PATCH 50/63] [#4206] Add missing image causing PDF generation to
 fail

---
 .../static/img/kolibri_placeholder.png          | Bin 0 -> 94601 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 contentcuration/contentcuration/static/img/kolibri_placeholder.png

diff --git a/contentcuration/contentcuration/static/img/kolibri_placeholder.png b/contentcuration/contentcuration/static/img/kolibri_placeholder.png
new file mode 100644
index 0000000000000000000000000000000000000000..c12008541e077e20794ab61bd2de1479ac0659da
GIT binary patch
literal 94601
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
Z1e$GsAA@7QX8OZ-MOoF?HPUZG{tsGPnsfjF

literal 0
HcmV?d00001


From b2793ffc9e5438ccba4996ef1883f28df341b5f1 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Fri, 7 Jul 2023 10:18:47 -0700
Subject: [PATCH 51/63] Fix Vue complaints about undefined 'name' used in
 template

---
 .../administration/pages/Channels/ChannelActionsDropdown.vue   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
index e243a8fd98..491706777c 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
@@ -146,6 +146,9 @@
       channel() {
         return this.getChannel(this.channelId);
       },
+      name() {
+        return this.channel.name;
+      },
       searchChannelEditorsLink() {
         return {
           name: RouteNames.USERS,

From 118894bd6846869a3ffcd862e355e8d6b5eda6af Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Fri, 7 Jul 2023 10:38:23 -0700
Subject: [PATCH 52/63] [#4200] Fix icon access in storage settings view

---
 .../frontend/settings/pages/Storage/index.vue         | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/settings/pages/Storage/index.vue b/contentcuration/contentcuration/frontend/settings/pages/Storage/index.vue
index 20a4b8750d..c493429edd 100644
--- a/contentcuration/contentcuration/frontend/settings/pages/Storage/index.vue
+++ b/contentcuration/contentcuration/frontend/settings/pages/Storage/index.vue
@@ -18,7 +18,7 @@
 
         <KFixedGridItem :key="`${kind}1`" span="3" class="row">
           <span class="mr-2 pa-2" :style="{ backgroundColor: theme[kind] }">
-            <KIcon :icon="kind" :color="$themeTokens.textInverted" />
+            <KIcon :icon="kindIcon(kind)" :color="$themeTokens.textInverted" />
           </span>
 
           <span>{{ translateConstant(kind) }}</span>
@@ -89,6 +89,15 @@
         const hiddenKinds = [ContentKindsNames.H5P, ContentKindsNames.TOPIC];
         return ContentKindsList.filter(k => !hiddenKinds.includes(k));
       },
+      kindIcon() {
+        return kind => {
+          // KIcon doesn't have an icon for ZIM, so we use the HTML5 icon instead
+          if (kind === ContentKindsNames.ZIM) {
+            return ContentKindsNames.HTML5;
+          }
+          return kind;
+        };
+      },
       storageUsagePercentage() {
         // Math.round to fix ParseInt issues for really small divisions to force the float to int
         return Math.round((this.usedSpace / this.totalSpace) * 100);

From 5139611407220b190ebb8b02ded8cb22ad1850f9 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Fri, 7 Jul 2023 11:10:13 -0700
Subject: [PATCH 53/63] Close drawer when opening language modal

---
 .../frontend/shared/views/MainNavigationDrawer.vue     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue b/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue
index 2ac62e285d..7f1843ccc5 100644
--- a/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue
@@ -42,7 +42,7 @@
             <VListTileTitle>{{ $tr('settingsLink') }}</VListTileTitle>
           </VListTileContent>
         </VListTile>
-        <VListTile @click="showLanguageModal = true">
+        <VListTile @click="openLanguageModal">
           <VListTileAction>
             <Icon>language</Icon>
           </VListTileAction>
@@ -51,8 +51,8 @@
           </VListTileContent>
         </VListTile>
         <VListTile
-          :href="helpLink" 
-          :tabindex="handleclickTab" 
+          :href="helpLink"
+          :tabindex="handleclickTab"
           target="_blank"
           @click="trackClick('Help')"
         >
@@ -163,6 +163,10 @@
       trackClick(label) {
         this.$analytics.trackClick('general', `User dropdown - ${label}`);
       },
+      openLanguageModal() {
+        this.drawer = false;
+        this.showLanguageModal = true;
+      },
     },
     $trs: {
       channelsLink: 'Channels',

From 09dc99297dc46f748c3cd58ee15540492498e7f9 Mon Sep 17 00:00:00 2001
From: Samson Akol <akolson2010@gmail.com>
Date: Sat, 8 Jul 2023 20:28:36 +0300
Subject: [PATCH 54/63] uses  instead of '!'=8084 '#'=0 '$'=7983 '*'=(  )
 -=569JNRXghikls '?'=127 @=(  ) ARGC=0 EPOCHREALTIME EPOCHSECONDS HISTCMD=5996
 LINENO=24 PPID=76126 TTYIDLE=0 ZSH_EVAL_CONTEXT=toplevel:cmdsubst
 ZSH_SUBSHELL=1 builtins dis_builtins dis_functions_source dis_patchars
 dis_reswords epochtime funcfiletrace funcsourcetrace funcstack
 functions_source functrace history historywords jobdirs jobstates jobtexts
 modules parameters patchars reswords status=127 terminfo userdirs usergroups
 zsh_eval_context=( toplevel cmdsubst )

---
 .../channelEdit/components/edit/DetailsTabView.vue     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
index 422fd1c4bc..2ea85d01b3 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
@@ -246,7 +246,7 @@
               ref="author"
               :items="authors"
               :label="$tr('authorLabel')"
-              :readonly="disableSourceEdits"
+              :disabled="disableSourceEdits"
               maxlength="200"
               counter
               autoSelectFirst
@@ -267,7 +267,7 @@
               ref="provider"
               :items="providers"
               :label="$tr('providerLabel')"
-              :readonly="disableSourceEdits"
+              :disabled="disableSourceEdits"
               maxlength="200"
               counter
               :placeholder="getPlaceholder('provider')"
@@ -288,7 +288,7 @@
               ref="aggregator"
               :items="aggregators"
               :label="$tr('aggregatorLabel')"
-              :readonly="disableSourceEdits"
+              :disabled="disableSourceEdits"
               maxlength="200"
               counter
               autoSelectFirst
@@ -309,7 +309,7 @@
               ref="license"
               v-model="licenseItem"
               :required="isUnique(license) && isUnique(license_description) && !disableAuthEdits"
-              :readonly="disableSourceEdits"
+              :disabled="disableSourceEdits"
               :placeholder="getPlaceholder('license')"
               :descriptionPlaceholder="getPlaceholder('license_description')"
               @focus="trackClick('License')"
@@ -328,7 +328,7 @@
               :rules="copyrightHolderRules"
               :placeholder="getPlaceholder('copyright_holder')"
               autoSelectFirst
-              :readonly="disableSourceEdits"
+              :disabled="disableSourceEdits"
               box
               :value="copyright_holder && copyright_holder.toString()"
               @input.native="(e) => (copyright_holder = e.srcElement.value)"

From 659b0eb04be6ca879e2e9c745547d67ddb11fb59 Mon Sep 17 00:00:00 2001
From: Blaine Jester <blainesworld@gmail.com>
Date: Mon, 10 Jul 2023 08:14:29 -0700
Subject: [PATCH 55/63] Remove public api export from deploy-migrate since it
 has run on prod

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b7575fe74e..be4a0b7b51 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ migrate:
 # 4) Remove the management command from this `deploy-migrate` recipe
 # 5) Repeat!
 deploy-migrate:
-	python contentcuration/manage.py export_channels_to_kolibri_public
+	echo "Nothing to do here!"
 
 contentnodegc:
 	python contentcuration/manage.py garbage_collect

From a10be695e92ee16a7ca2e56cf1eee1f4644fe30e Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Tue, 18 Jul 2023 18:14:57 -0700
Subject: [PATCH 56/63] Handle errors in publishing better by cleaning up
 database connections.

---
 .../contentcuration/tests/test_exportchannel.py       |  4 ++--
 contentcuration/kolibri_content/router.py             | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/contentcuration/contentcuration/tests/test_exportchannel.py b/contentcuration/contentcuration/tests/test_exportchannel.py
index 68e5c3c502..6c609057ba 100644
--- a/contentcuration/contentcuration/tests/test_exportchannel.py
+++ b/contentcuration/contentcuration/tests/test_exportchannel.py
@@ -9,6 +9,7 @@
 from django.core.management import call_command
 from django.db import connections
 from kolibri_content import models as kolibri_models
+from kolibri_content.router import cleanup_content_database_connection
 from kolibri_content.router import get_active_content_database
 from kolibri_content.router import set_active_content_database
 from le_utils.constants import exercises
@@ -216,8 +217,7 @@ def setUp(self):
 
     def tearDown(self):
         # Clean up datbase connection after the test
-        connections[self.tempdb].close()
-        del connections.databases[self.tempdb]
+        cleanup_content_database_connection(self.tempdb)
         super(ExportChannelTestCase, self).tearDown()
         set_active_content_database(None)
         if os.path.exists(self.tempdb):
diff --git a/contentcuration/kolibri_content/router.py b/contentcuration/kolibri_content/router.py
index b7b2e69b70..9a991a9df1 100644
--- a/contentcuration/kolibri_content/router.py
+++ b/contentcuration/kolibri_content/router.py
@@ -72,6 +72,16 @@ def get_content_database_connection(alias=None):
     return connections[alias].connection
 
 
+def cleanup_content_database_connection(alias):
+    try:
+        connection = connections[alias]
+        connection.close()
+        del connections.databases[alias]
+    except (ConnectionDoesNotExist, KeyError):
+        # Already cleaned up, nothing to do here!
+        pass
+
+
 class ContentDBRouter(object):
     """A router that decides what content database to read from based on a thread-local variable."""
 
@@ -158,6 +168,7 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_value, traceback):
         set_active_content_database(self.previous_alias)
+        cleanup_content_database_connection(self.alias)
 
     def __call__(self, querying_func):
         # allow using the context manager as a decorator

From ab6f52707ae42e92b668107f0cd3ad2e25ae9573 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Tue, 18 Jul 2023 18:16:24 -0700
Subject: [PATCH 57/63] Add test case for publishing an empty channel. Throw a
 value error similarly to if the channel root node is incomplete.

---
 contentcuration/contentcuration/models.py     |  3 +++
 .../tests/test_exportchannel.py               | 23 +++++++++++++++++++
 .../contentcuration/utils/publish.py          |  6 ++---
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/contentcuration/contentcuration/models.py b/contentcuration/contentcuration/models.py
index 2a9f99633f..86a400931c 100644
--- a/contentcuration/contentcuration/models.py
+++ b/contentcuration/contentcuration/models.py
@@ -1971,6 +1971,9 @@ def copy_to(
     def copy(self):
         return self.copy_to()
 
+    def is_publishable(self):
+        return self.complete and self.get_descendants(include_self=True).exclude(kind_id=content_kinds.TOPIC).exists()
+
     class Meta:
         verbose_name = "Topic"
         verbose_name_plural = "Topics"
diff --git a/contentcuration/contentcuration/tests/test_exportchannel.py b/contentcuration/contentcuration/tests/test_exportchannel.py
index 6c609057ba..336b1091c9 100644
--- a/contentcuration/contentcuration/tests/test_exportchannel.py
+++ b/contentcuration/contentcuration/tests/test_exportchannel.py
@@ -429,6 +429,29 @@ def test_publish_no_modify_legacy_exercise_extra_fields(self):
         })
 
 
+class EmptyChannelTestCase(StudioTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super(EmptyChannelTestCase, cls).setUpClass()
+        cls.patch_copy_db = patch('contentcuration.utils.publish.save_export_database')
+        cls.patch_copy_db.start()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(EmptyChannelTestCase, cls).tearDownClass()
+        cls.patch_copy_db.stop()
+
+    def test_publish_empty_channel(self):
+        content_channel = channel()
+        set_channel_icon_encoding(content_channel)
+        content_channel.main_tree.complete = True
+        content_channel.main_tree.save()
+        content_channel.main_tree.get_descendants().exclude(kind_id="topic").delete()
+        with self.assertRaises(ValueError):
+            create_content_database(content_channel, True, self.admin_user.id, True)
+
+
 class ChannelExportUtilityFunctionTestCase(StudioTestCase):
     @classmethod
     def setUpClass(cls):
diff --git a/contentcuration/contentcuration/utils/publish.py b/contentcuration/contentcuration/utils/publish.py
index 90d3ef3ccc..92dd4edbe0 100644
--- a/contentcuration/contentcuration/utils/publish.py
+++ b/contentcuration/contentcuration/utils/publish.py
@@ -195,8 +195,8 @@ def __init__(
         force_exercises=False,
         progress_tracker=None,
     ):
-        if not root_node.complete:
-            raise ValueError("Attempted to publish a channel with an incomplete root node")
+        if not root_node.is_publishable():
+            raise ValueError("Attempted to publish a channel with an incomplete root node or no resources")
 
         self.root_node = root_node
         task_percent_total = 80.0
@@ -220,7 +220,7 @@ def recurse_nodes(self, node, inherited_fields):  # noqa C901
         logging.debug("Mapping node with id {id}".format(id=node.pk))
 
         # Only process nodes that are either non-topics or have non-topic descendants
-        if node.get_descendants(include_self=True).exclude(kind_id=content_kinds.TOPIC).exists() and node.complete:
+        if node.is_publishable():
             # early validation to make sure we don't have any exercises without mastery models
             # which should be unlikely when the node is complete, but just in case
             if node.kind_id == content_kinds.EXERCISE:

From 0b80f79e6b29274fea292838b8879f993e4336c3 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Tue, 18 Jul 2023 18:23:27 -0700
Subject: [PATCH 58/63] Add special handling of publishes that cannot go ahead.

---
 .../contentcuration/tests/test_exportchannel.py           | 3 ++-
 contentcuration/contentcuration/utils/publish.py          | 6 +++++-
 contentcuration/contentcuration/viewsets/channel.py       | 8 ++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/contentcuration/contentcuration/tests/test_exportchannel.py b/contentcuration/contentcuration/tests/test_exportchannel.py
index 336b1091c9..36e331c713 100644
--- a/contentcuration/contentcuration/tests/test_exportchannel.py
+++ b/contentcuration/contentcuration/tests/test_exportchannel.py
@@ -29,6 +29,7 @@
 from .testdata import slideshow
 from .testdata import thumbnail_bytes
 from contentcuration import models as cc
+from contentcuration.utils.publish import ChannelIncompleteError
 from contentcuration.utils.publish import convert_channel_thumbnail
 from contentcuration.utils.publish import create_content_database
 from contentcuration.utils.publish import create_slideshow_manifest
@@ -448,7 +449,7 @@ def test_publish_empty_channel(self):
         content_channel.main_tree.complete = True
         content_channel.main_tree.save()
         content_channel.main_tree.get_descendants().exclude(kind_id="topic").delete()
-        with self.assertRaises(ValueError):
+        with self.assertRaises(ChannelIncompleteError):
             create_content_database(content_channel, True, self.admin_user.id, True)
 
 
diff --git a/contentcuration/contentcuration/utils/publish.py b/contentcuration/contentcuration/utils/publish.py
index 92dd4edbe0..5bfddf4b7b 100644
--- a/contentcuration/contentcuration/utils/publish.py
+++ b/contentcuration/contentcuration/utils/publish.py
@@ -74,6 +74,10 @@ class NoNodesChangedError(Exception):
     pass
 
 
+class ChannelIncompleteError(Exception):
+    pass
+
+
 class SlowPublishError(Exception):
     """
     Used to track slow Publishing operations. We don't raise this error,
@@ -196,7 +200,7 @@ def __init__(
         progress_tracker=None,
     ):
         if not root_node.is_publishable():
-            raise ValueError("Attempted to publish a channel with an incomplete root node or no resources")
+            raise ChannelIncompleteError("Attempted to publish a channel with an incomplete root node or no resources")
 
         self.root_node = root_node
         task_percent_total = 80.0
diff --git a/contentcuration/contentcuration/viewsets/channel.py b/contentcuration/contentcuration/viewsets/channel.py
index 737269acf1..6715cfd3e4 100644
--- a/contentcuration/contentcuration/viewsets/channel.py
+++ b/contentcuration/contentcuration/viewsets/channel.py
@@ -40,6 +40,7 @@
 from contentcuration.utils.garbage_collect import get_deleted_chefs_root
 from contentcuration.utils.pagination import CachedListPagination
 from contentcuration.utils.pagination import ValuesViewsetPageNumberPagination
+from contentcuration.utils.publish import ChannelIncompleteError
 from contentcuration.utils.publish import publish_channel
 from contentcuration.utils.sync import sync_channel
 from contentcuration.viewsets.base import BulkListSerializer
@@ -503,6 +504,13 @@ def publish(self, pk, version_notes="", language=None):
                         }, channel_id=channel.id
                     ),
                 ], applied=True)
+            except ChannelIncompleteError:
+                Change.create_changes([
+                    generate_update_event(
+                        channel.id, CHANNEL, {"publishing": False}, channel_id=channel.id
+                    ),
+                ], applied=True)
+                raise ValidationError("Channel is not ready to be published")
             except Exception:
                 Change.create_changes([
                     generate_update_event(

From 14b89ea03c3d10bb190d86a172e431e79dc18336 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Wed, 19 Jul 2023 09:33:48 -0700
Subject: [PATCH 59/63] Handle tear down better to avoid errors.

---
 contentcuration/kolibri_public/tests/test_mapper.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/contentcuration/kolibri_public/tests/test_mapper.py b/contentcuration/kolibri_public/tests/test_mapper.py
index a10ef159e1..4b56813464 100644
--- a/contentcuration/kolibri_public/tests/test_mapper.py
+++ b/contentcuration/kolibri_public/tests/test_mapper.py
@@ -2,9 +2,9 @@
 import tempfile
 
 from django.core.management import call_command
-from django.db import connections
 from django.test import TestCase
 from kolibri_content import models as kolibri_content_models
+from kolibri_content.router import cleanup_content_database_connection
 from kolibri_content.router import get_active_content_database
 from kolibri_content.router import using_content_database
 from kolibri_public import models as kolibri_public_models
@@ -116,8 +116,7 @@ def test_map_replace(self):
     @classmethod
     def tearDownClass(cls):
         # Clean up datbase connection after the test
-        connections[cls.tempdb].close()
-        del connections.databases[cls.tempdb]
+        cleanup_content_database_connection(cls.tempdb)
         super(ChannelMapperTest, cls).tearDownClass()
         if os.path.exists(cls.tempdb):
             os.remove(cls.tempdb)

From 77dd2cd7ade727cdcaa8ba5e466d971c3d50b6e2 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Wed, 19 Jul 2023 13:24:00 -0700
Subject: [PATCH 60/63] Prevent errors when creating already existing tag
 through model entries.

---
 contentcuration/contentcuration/db/models/manager.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/db/models/manager.py b/contentcuration/contentcuration/db/models/manager.py
index 4d833caf8f..b5970a72f8 100644
--- a/contentcuration/contentcuration/db/models/manager.py
+++ b/contentcuration/contentcuration/db/models/manager.py
@@ -487,6 +487,7 @@ def _copy_tags(self, source_copy_id_map):
                 tag_id_map[tag.id] = new_tag.id
                 tags_to_create.append(new_tag)
 
+        # TODO: Can cleanup the above and change the below to use ignore_conflicts=True
         ContentTag.objects.bulk_create(tags_to_create)
 
         mappings_to_create = [
@@ -499,7 +500,10 @@ def _copy_tags(self, source_copy_id_map):
             for mapping in node_tags_mappings
         ]
 
-        self.model.tags.through.objects.bulk_create(mappings_to_create)
+        # rtibbles: For reasons I have not been able to discern, under certain circumstances
+        # these mappings can already exist in the database. This is a workaround to prevent
+        # this from breaking copying.
+        self.model.tags.through.objects.bulk_create(mappings_to_create, ignore_conflicts=True)
 
     def _copy_assessment_items(self, source_copy_id_map):
         from contentcuration.models import File

From 1d78f3bb5226d725f64fa8218cdb79f491629ff7 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Wed, 19 Jul 2023 13:31:13 -0700
Subject: [PATCH 61/63] Fix bitmask filtering by multiple labels for AND rather
 than OR behaviour.

---
 contentcuration/kolibri_public/models.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/contentcuration/kolibri_public/models.py b/contentcuration/kolibri_public/models.py
index 6b20c1f1d7..c0056d9cf9 100644
--- a/contentcuration/kolibri_public/models.py
+++ b/contentcuration/kolibri_public/models.py
@@ -29,7 +29,15 @@ def has_all_labels(self, field_name, labels):
         annotations = {}
         for bitmask_fieldname, bits in bits.items():
             annotation_fieldname = "{}_{}".format(bitmask_fieldname, "masked")
-            filters[annotation_fieldname + "__gt"] = 0
+            # To get the correct result, i.e. an AND that all the labels are present,
+            # we need to check that the aggregated value is euqal to the bits.
+            # If we wanted an OR (which would check for any being present),
+            # we would have to use GREATER THAN 0 here.
+            filters[annotation_fieldname] = bits
+            # This ensures that the annotated value is the result of the AND operation
+            # so if all the values are present, the result will be the same as the bits
+            # but if any are missing, it will not be equal to the bits, but will only be
+            # 0 if none of the bits are present.
             annotations[annotation_fieldname] = F(bitmask_fieldname).bitand(bits)
 
         return self.annotate(**annotations).filter(**filters)

From 11091173924c7095ed04c9e04c885022a7ab3de1 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Wed, 19 Jul 2023 15:42:22 -0700
Subject: [PATCH 62/63] Add regression test for duplicate tags edge case.

---
 .../contentcuration/db/models/manager.py      |  6 +--
 .../tests/test_contentnodes.py                | 42 ++++++++++++++++---
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/contentcuration/contentcuration/db/models/manager.py b/contentcuration/contentcuration/db/models/manager.py
index b5970a72f8..db1e3a77bf 100644
--- a/contentcuration/contentcuration/db/models/manager.py
+++ b/contentcuration/contentcuration/db/models/manager.py
@@ -500,9 +500,9 @@ def _copy_tags(self, source_copy_id_map):
             for mapping in node_tags_mappings
         ]
 
-        # rtibbles: For reasons I have not been able to discern, under certain circumstances
-        # these mappings can already exist in the database. This is a workaround to prevent
-        # this from breaking copying.
+        # In the case that we are copying a node that is in the weird state of having a tag
+        # that is duplicated (with a channel tag and a null channel tag) this can cause an error
+        # so we ignore conflicts here to ignore the duplicate tags.
         self.model.tags.through.objects.bulk_create(mappings_to_create, ignore_conflicts=True)
 
     def _copy_assessment_items(self, source_copy_id_map):
diff --git a/contentcuration/contentcuration/tests/test_contentnodes.py b/contentcuration/contentcuration/tests/test_contentnodes.py
index e2dfc0a846..57496362cf 100644
--- a/contentcuration/contentcuration/tests/test_contentnodes.py
+++ b/contentcuration/contentcuration/tests/test_contentnodes.py
@@ -78,7 +78,7 @@ def _check_files_for_object(source, copy):
 
 
 def _check_tags_for_node(source, copy):
-    source_tags = source.tags.all().order_by("tag_name")
+    source_tags = source.tags.all().order_by("tag_name").distinct("tag_name")
     copy_tags = copy.tags.all().order_by("tag_name")
     assert len(source_tags) == len(copy_tags)
     for source_tag, copy_tag in zip(source_tags, copy_tags):
@@ -415,6 +415,40 @@ def test_duplicate_nodes_with_tags(self):
             num_test_tags_before, ContentTag.objects.filter(tag_name="test").count()
         )
 
+    def test_duplicate_nodes_with_duplicate_tags(self):
+        """
+        Ensures that when we copy nodes with duplicated tags they get copied
+        """
+        new_channel = testdata.channel()
+
+        tree = TreeBuilder(tags=True)
+        self.channel.main_tree = tree.root
+        self.channel.save()
+
+        # Add a legacy tag with a set channel to test the tag copying behaviour.
+        legacy_tag = ContentTag.objects.create(tag_name="test", channel=self.channel)
+        # Add an identical tag without a set channel to make sure it gets reused.
+        identical_tag = ContentTag.objects.create(tag_name="test")
+
+        num_test_tags_before = ContentTag.objects.filter(tag_name="test").count()
+
+        # Add both the legacy and the new style tag and ensure that it doesn't break.
+        self.channel.main_tree.get_children().first().tags.add(legacy_tag)
+        self.channel.main_tree.get_children().first().tags.add(identical_tag)
+
+        self.channel.main_tree.copy_to(new_channel.main_tree, batch_size=1000)
+
+        _check_node_copy(
+            self.channel.main_tree,
+            new_channel.main_tree.get_children().last(),
+            original_channel_id=self.channel.id,
+            channel=new_channel,
+        )
+
+        self.assertEqual(
+            num_test_tags_before, ContentTag.objects.filter(tag_name="test").count()
+        )
+
     def test_duplicate_nodes_deep(self):
         """
         Ensures that when we copy nodes in a deep way, a full copy happens
@@ -533,8 +567,7 @@ def test_duplicate_nodes_freeze_authoring_data_no_edit(self):
 
     def test_duplicate_nodes_no_freeze_authoring_data_edit(self):
         """
-        Ensures that when we copy nodes, we can exclude nodes from the descendant
-        hierarchy
+        Ensures that when we copy nodes, we can modify fields if they are not frozen for editing
         """
         new_channel = testdata.channel()
 
@@ -553,8 +586,7 @@ def test_duplicate_nodes_no_freeze_authoring_data_edit(self):
 
     def test_duplicate_nodes_freeze_authoring_data_edit(self):
         """
-        Ensures that when we copy nodes, we can exclude nodes from the descendant
-        hierarchy
+        Ensures that when we copy nodes, we can't modify fields if they are frozen for editing
         """
         new_channel = testdata.channel()
 

From 9a48ae4f2de349365bcfd9307223eb87abe9d1dc Mon Sep 17 00:00:00 2001
From: Vivek Agrawal <vivekmittalagrawal@gmail.com>
Date: Tue, 25 Jul 2023 12:43:38 +0530
Subject: [PATCH 63/63] Fix undo of copying

---
 .../contentcuration/frontend/shared/data/changes.js       | 8 ++------
 .../frontend/shared/vuex/indexedDBPlugin/index.js         | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/shared/data/changes.js b/contentcuration/contentcuration/frontend/shared/data/changes.js
index f62a50a09e..7403690c6f 100644
--- a/contentcuration/contentcuration/frontend/shared/data/changes.js
+++ b/contentcuration/contentcuration/frontend/shared/data/changes.js
@@ -160,12 +160,8 @@ export class ChangeTracker {
           change.type === CHANGE_TYPES.COPIED ||
           (change.type === CHANGE_TYPES.MOVED && !change.oldObj)
         ) {
-          // Get the primary key's field name off the table to make sure we delete by
-          // the change key
-          return resource.table
-            .where(resource.table.schema.primKey.keyPath)
-            .equals(change.key)
-            .delete();
+          // Use resource's delete method to propogate sync object to backend.
+          return resource.delete(change.key);
         } else if (change.type === CHANGE_TYPES.UPDATED || change.type === CHANGE_TYPES.DELETED) {
           // If we updated or deleted it, we just want the old stuff back
           return resource.table.put(change.oldObj);
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/indexedDBPlugin/index.js b/contentcuration/contentcuration/frontend/shared/vuex/indexedDBPlugin/index.js
index 9f4fddfb57..f8afa7445b 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/indexedDBPlugin/index.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/indexedDBPlugin/index.js
@@ -116,7 +116,7 @@ export default function IndexedDBPlugin(db, listeners = []) {
       }
       // omit the last fetched attribute used only in resource layer
       const mods = omit(obj, [LAST_FETCHED]);
-      if (Object.keys(mods).length === 0) {
+      if (Object.keys(mods).length === 0 && change.type === CHANGE_TYPES.UPDATED) {
         return;
       }
       events.emit(getEventName(change.table, change.type), {