Patch release v2026.08.06

.github/workflows/pythontest.yml

@@ -62,6 +62,8 @@ jobs:
           - 6379:6379
     steps:
     - uses: actions/checkout@v6
+      with:
+        fetch-depth: 0
     - name: Set up minio
       run: |
         docker run -d -p 9000:9000 --name minio \
@@ -79,6 +81,17 @@ jobs:
       run: |
         # Use uv to install dependencies directly from requirements files
         uv pip sync requirements.txt requirements-dev.txt
+    - name: Lint new migrations for unsafe operations
+      if: github.event_name == 'pull_request'
+      env:
+        BASE_REF: ${{ github.base_ref }}
+        DJANGO_SETTINGS_MODULE: contentcuration.not_production_settings
+      run: |
+        set -euo pipefail
+        git fetch --no-tags origin "$BASE_REF"
+        base="$(git merge-base "origin/$BASE_REF" HEAD)"
+        test -n "$base"
+        python contentcuration/manage.py lintmigrations --git-commit-id "$base" --no-cache --warnings-as-errors
     - name: Test pytest
       run: |
         sh -c './contentcuration/manage.py makemigrations --check'

Makefile

@@ -39,7 +39,8 @@ migrate:
 # 4) Remove the management command from this `deploy-migrate` recipe
 # 5) Repeat!
 deploy-migrate:
-	echo "Nothing to do here!"
+	# studio#5974: remove at cutover.
+	python contentcuration/manage.py backfill_column --model contentcuration.File --source-field file_size --target-field file_size_bigint
 
 contentnodegc:
 	python contentcuration/manage.py garbage_collect

contentcuration/contentcuration/db/dual_write.py

@@ -0,0 +1,31 @@
+import hashlib
+
+import pgtrigger
+
+
+def mirror_field(source, target):
+    """Mirror Django field `source` into `target` via a BEFORE INSERT/UPDATE
+    trigger (expand/contract dual-write)."""
+
+    def decorator(model):
+        source_col = model._meta.get_field(source).column
+        target_col = model._meta.get_field(target).column
+        name = "mirror_{}_to_{}".format(source_col, target_col)
+        if len(name) > 43:  # stay safely under pgtrigger's trigger-name limit
+            digest = hashlib.sha1(
+                "{}_{}".format(source_col, target_col).encode()
+            ).hexdigest()[:8]
+            name = "mirror_{}".format(digest)
+        # Change-guard (IS DISTINCT FROM): keeps a read cutover from clobbering
+        # writes to the repointed column with the stale source value.
+        trigger = pgtrigger.Trigger(
+            name=name,
+            when=pgtrigger.Before,
+            operation=pgtrigger.Insert | pgtrigger.Update,
+            func="IF NEW.{s} IS DISTINCT FROM OLD.{s} THEN NEW.{t} = NEW.{s}; END IF; RETURN NEW;".format(
+                s=source_col, t=target_col
+            ),
+        )
+        return pgtrigger.register(trigger)(model)
+
+    return decorator

contentcuration/contentcuration/frontend/administration/components/CommunityLibraryStatusButton.vue

@@ -105,7 +105,6 @@
   .community-library-status-button {
     @extend %md-standard-func;
 
-    width: 9em;
     padding: 4px;
     color: v-bind('labelColor');
     background-color: v-bind('color');

contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelTable.vue

@@ -304,11 +304,16 @@
         fetchQueryParams: keywordSearchFetchQueryParams,
       } = useKeywordSearch();
 
+      // channelStatusFilter is derived from the current channelType's options, so an
+      // existing status that's no longer valid for the new type already reads back as
+      // unset - only default it to the first option in that case.
       watch(
         channelTypeFilter,
         () => {
-          const options = channelStatusOptions.value;
-          channelStatusFilter.value = options.length ? options[0].value : null;
+          if (!channelStatusFilter.value) {
+            const options = channelStatusOptions.value;
+            channelStatusFilter.value = options.length ? options[0].value : null;
+          }
         },
         { immediate: true },
       );

contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelTable.spec.js

@@ -11,8 +11,8 @@ localVue.use(router);
 
 const channelList = ['test', 'channel', 'table'];
 
-function makeWrapper(store) {
-  router.replace({ name: RouteNames.CHANNELS });
+function makeWrapper(store, query = {}) {
+  router.replace({ name: RouteNames.CHANNELS, query });
 
   return mount(ChannelTable, {
     router,
@@ -71,13 +71,32 @@ describe('channelTable', () => {
 
       expect(router.currentRoute.query.keywords).toBe('keyword test');
     });
-    it('changing channel type filter should reset channel status filter', async () => {
+    it('changing channel type filter should reset channel status filter when it is no longer valid', async () => {
+      wrapper.vm.channelTypeFilter = ChannelTypeFilter.COMMUNITY_LIBRARY;
+      wrapper.vm.channelStatusFilter = 'needsReview';
+      await wrapper.vm.$nextTick();
+      // Kolibri library channels have no "needs review" status
+      wrapper.vm.channelTypeFilter = ChannelTypeFilter.KOLIBRI_LIBRARY;
+      await wrapper.vm.$nextTick();
+      expect(wrapper.vm.channelStatusFilter).toBe('live');
+    });
+    it('changing channel type filter should keep the channel status filter when it is still valid', async () => {
       wrapper.vm.channelTypeFilter = ChannelTypeFilter.COMMUNITY_LIBRARY;
       wrapper.vm.channelStatusFilter = 'published';
       await wrapper.vm.$nextTick();
+      // "published" is a valid status for unlisted channels too
       wrapper.vm.channelTypeFilter = ChannelTypeFilter.UNLISTED;
       await wrapper.vm.$nextTick();
-      expect(wrapper.vm.channelStatusFilter).toBe('live');
+      expect(wrapper.vm.channelStatusFilter).toBe('published');
+    });
+    it('should preserve a valid channel status filter already present in the URL on mount', () => {
+      // Simulates navigating back to this page with filters still in the URL
+      // (e.g. after opening a channel and hitting the browser back button).
+      const backNavWrapper = makeWrapper(store, {
+        channelType: ChannelTypeFilter.COMMUNITY_LIBRARY,
+        channelStatus: 'needsReview',
+      });
+      expect(backNavWrapper.vm.channelStatusFilter).toBe('needsReview');
     });
   });
   describe('selection', () => {

contentcuration/contentcuration/frontend/administration/router.js

@@ -34,11 +34,7 @@ const router = new VueRouter({
       name: RouteNames.COMMUNITY_LIBRARY_SUBMISSION,
       path: '/community-library/:channelId/:submissionId',
       component: SubmissionDetailsModal,
-      props: route => ({
-        channelId: route.params.channelId,
-        submissionId: route.params.submissionId,
-        adminReview: true,
-      }),
+      props: true,
     },
     // Catch-all redirect to channels tab
     {

contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/TipTapEditor.vue

@@ -197,7 +197,10 @@
         return editor.value.storage.markdown.getMarkdown();
       };
 
-      let isUpdatingFromOutside = false; // A flag to prevent infinite update loops
+      // Cache of the latest markdown value emitted by this component. Used to
+      // detect when an incoming prop.value is just our own emitted value echoed
+      // back, so we can skip unnecessary re-rendering of the editor content.
+      let lastEmittedMarkdown = null;
 
       watch(
         () => props.mode,
@@ -217,6 +220,13 @@
       watch(
         () => props.value,
         newValue => {
+          // If the incoming value matches what we last emitted, the editor
+          // already reflects this content, so skip re-rendering to avoid
+          // unnecessary work and resetting the editor state.
+          if (newValue === lastEmittedMarkdown) {
+            return;
+          }
+
           const processedContent = preprocessMarkdown(newValue);
 
           if (!editor.value) {
@@ -228,36 +238,31 @@
 
           const editorContent = getMarkdownContent();
           if (editorContent !== newValue) {
-            isUpdatingFromOutside = true;
             editor.value.commands.setContent(processedContent, false);
-            nextTick(() => {
-              isUpdatingFromOutside = false;
-            });
           }
         },
         { immediate: true },
       );
 
-      // sync changes from the editor to the parent component
-      watch(
-        () => editor.value?.state,
-        () => {
-          if (
-            !editor.value ||
-            !isReady.value ||
-            isUpdatingFromOutside ||
-            !editor.value.storage?.markdown
-          ) {
-            return;
-          }
+      // sync changes from the editor to the parent component, only on blur
+      const emitMarkdownUpdate = () => {
+        if (!editor.value || !isReady.value || !editor.value.storage?.markdown) {
+          return;
+        }
 
-          const markdown = getMarkdownContent();
-          if (markdown !== props.value) {
-            emit('update', markdown);
-          }
-        },
-        { deep: true },
-      );
+        const markdown = getMarkdownContent();
+        if (markdown !== props.value) {
+          lastEmittedMarkdown = markdown;
+          emit('update', markdown);
+        }
+      };
+
+      // Emit the markdown update only when the editor loses focus (blur).
+      watch(isFocused, (focused, wasFocused) => {
+        if (wasFocused && !focused) {
+          emitMarkdownUpdate();
+        }
+      });
 
       const handleContainerKeydown = event => {
         if (event.key === 'Enter') {

contentcuration/contentcuration/frontend/shared/views/communityLibrary/SubmissionDetailsModal/__tests__/index.spec.js

@@ -0,0 +1,81 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
+import VueRouter from 'vue-router';
+import SubmissionDetailsModal from '../index.vue';
+import {
+  AdminCommunityLibrarySubmission,
+  ChannelVersion,
+  CommunityLibrarySubmission,
+} from 'shared/data/resources';
+
+jest.mock('shared/data/resources', () => ({
+  AdminCommunityLibrarySubmission: { fetchModel: jest.fn() },
+  ChannelVersion: { fetchCollection: jest.fn() },
+  CommunityLibrarySubmission: {
+    fetchModel: jest.fn(),
+    fetchCollection: jest.fn(() => Promise.resolve({ results: [] })),
+  },
+}));
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+localVue.use(VueRouter);
+
+const stubChannel = {
+  id: 'ch1',
+  name: 'Test',
+  thumbnail_url: null,
+  thumbnail_encoding: null,
+  description: '',
+};
+const stubSubmission = {
+  id: 'sub1',
+  channel_id: 'ch1',
+  channel_version: 1,
+  status: 'PENDING',
+  version_token: null,
+};
+const stubChannelVersion = { id: 'cv1' };
+
+function makeStore(isAdmin) {
+  return new Vuex.Store({
+    getters: { isAdmin: () => isAdmin },
+    modules: {
+      channel: {
+        namespaced: true,
+        actions: { loadChannel: jest.fn(() => Promise.resolve(stubChannel)) },
+      },
+      errors: { namespaced: true, actions: { handleAxiosError: jest.fn() } },
+    },
+  });
+}
+
+describe('SubmissionDetailsModal', () => {
+  beforeEach(() => {
+    AdminCommunityLibrarySubmission.fetchModel.mockResolvedValue(stubSubmission);
+    CommunityLibrarySubmission.fetchModel.mockResolvedValue(stubSubmission);
+    ChannelVersion.fetchCollection.mockResolvedValue([stubChannelVersion]);
+  });
+
+  afterEach(() => jest.clearAllMocks());
+
+  it('uses AdminCommunityLibrarySubmission when user is admin', () => {
+    shallowMount(SubmissionDetailsModal, {
+      localVue,
+      store: makeStore(true),
+      router: new VueRouter(),
+      propsData: { channelId: 'ch1', submissionId: 'sub1' },
+    });
+    expect(AdminCommunityLibrarySubmission.fetchModel).toHaveBeenCalledWith('sub1');
+  });
+
+  it('uses CommunityLibrarySubmission when user is not admin', () => {
+    shallowMount(SubmissionDetailsModal, {
+      localVue,
+      store: makeStore(false),
+      router: new VueRouter(),
+      propsData: { channelId: 'ch1', submissionId: 'sub1' },
+    });
+    expect(CommunityLibrarySubmission.fetchModel).toHaveBeenCalledWith('sub1');
+  });
+});

contentcuration/contentcuration/frontend/shared/views/communityLibrary/SubmissionDetailsModal/index.vue

@@ -74,12 +74,12 @@
         </div>
         <div class="actions">
           <KButton
-            v-if="adminReview && submission.status === CommunityLibraryStatus.PENDING"
+            v-if="isAdmin && submission.status === CommunityLibraryStatus.PENDING"
             :text="reviewAction$()"
             @click="showReviewSidePanel = true"
           />
           <ChannelActionsDropdown
-            v-if="adminReview"
+            v-if="isAdmin"
             primary
             :channelId="channelId"
           />
@@ -105,7 +105,7 @@
         :channelId="channelId"
       />
       <ReviewSubmissionSidePanel
-        v-if="adminReview && showReviewSidePanel"
+        v-if="isAdmin && showReviewSidePanel"
         :submissionId="submission.id"
         :channel="channel"
         @close="showReviewSidePanel = false"
@@ -143,10 +143,6 @@
   import logging from 'shared/logging';
 
   const props = defineProps({
-    adminReview: {
-      type: Boolean,
-      default: false,
-    },
     channelId: {
       type: String,
       required: true,
@@ -163,6 +159,7 @@
   const route = useRoute();
   const router = useRouter();
   const store = useStore();
+  const isAdmin = computed(() => store.getters.isAdmin);
   const { windowBreakpoint } = useKResponsiveWindow();
 
   const isModalOpen = computed({
@@ -206,7 +203,7 @@
   } = useFetch({
     asyncFetchFunc: async () => {
       try {
-        const Resource = props.adminReview
+        const Resource = isAdmin.value
           ? AdminCommunityLibrarySubmission
           : CommunityLibrarySubmission;
         const submission = await Resource.fetchModel(props.submissionId);