From 0241323b65fa2a8f6dc04d28712509242c7607aa Mon Sep 17 00:00:00 2001
From: taoerman <qiliu0523@gmail.com>
Date: Thu, 30 Oct 2025 15:44:43 -0700
Subject: [PATCH 1/4] Add loader if channel is being published and community
 library side panel is open

---
 .../SubmitToCommunityLibrarySidePanel.spec.js | 49 ++++++++++
 .../index.vue                                 | 89 ++++++++++++++++---
 .../strings/communityChannelsStrings.js       |  5 ++
 .../test_community_library_submission.py      | 20 +++++
 .../viewsets/community_library_submission.py  |  6 ++
 5 files changed, 155 insertions(+), 14 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/__tests__/SubmitToCommunityLibrarySidePanel.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/__tests__/SubmitToCommunityLibrarySidePanel.spec.js
index e66e568157..18c1cda437 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/__tests__/SubmitToCommunityLibrarySidePanel.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/__tests__/SubmitToCommunityLibrarySidePanel.spec.js
@@ -23,6 +23,9 @@ jest.mock('shared/data/resources', () => ({
   CommunityLibrarySubmission: {
     create: jest.fn(() => Promise.resolve()),
   },
+  Channel: {
+    fetchModel: jest.fn(),
+  },
 }));
 
 const store = factory();
@@ -270,6 +273,52 @@ describe('SubmitToCommunityLibrarySidePanel', () => {
     });
   });
 
+  describe('publishing state', () => {
+    beforeEach(() => {
+      jest.useFakeTimers();
+    });
+    afterEach(() => {
+      jest.useRealTimers();
+    });
+
+    it('disables form and shows loader when channel is publishing', async () => {
+      const channel = { ...publishedNonPublicChannel, publishing: true };
+      const wrapper = await makeWrapper({ channel, publishedData, latestSubmission: null });
+
+      // Loader/message container should exist
+      expect(wrapper.find('.publishing-loader').exists()).toBe(true);
+
+      // Fields and submit are disabled while publishing
+      const descriptionTextbox = wrapper.findComponent('.description-textbox');
+      expect(descriptionTextbox.props('disabled')).toBe(true);
+      const submitButton = wrapper.find('[data-test="submit-button"]');
+      expect(submitButton.attributes('disabled')).toBe('disabled');
+    });
+
+    it('enables form after publishing flips to false (poll-driven)', async () => {
+      const { Channel } = require('shared/data/resources');
+      Channel.fetchModel.mockResolvedValueOnce({
+        id: publishedNonPublicChannel.id,
+        publishing: false,
+        version: 3,
+      });
+
+      const channel = { ...publishedNonPublicChannel, publishing: true };
+      const wrapper = await makeWrapper({ channel, publishedData, latestSubmission: null });
+
+      jest.advanceTimersByTime(2100);
+      await wrapper.vm.$nextTick();
+
+      const descriptionTextbox = wrapper.findComponent('.description-textbox');
+      expect(descriptionTextbox.props('disabled')).toBe(false);
+      
+      await descriptionTextbox.vm.$emit('input', 'Some description');
+      await wrapper.vm.$nextTick();
+      const submitButton = wrapper.find('[data-test="submit-button"]');
+      expect(submitButton.attributes('disabled')).toBeUndefined();
+    });
+  });
+
   describe('show less button', () => {
     it('is displayed when additional info is shown', async () => {
       const wrapper = await makeWrapper({
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/index.vue
index d3d4e91d5f..f32c0c9fca 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/index.vue
@@ -12,9 +12,16 @@
 
       <template #default>
         <div class="content">
+          <div
+            v-if="isPublishing"
+            class="publishing-loader"
+          >
+            <KCircularLoader disableDefaultTransition />
+            <div class="publishing-text">{{ publishingMessage$() }}</div>
+          </div>
           <Box
             kind="info"
-            :loading="latestSubmissionIsLoading"
+            :loading="latestSubmissionIsLoading || isPublishing"
             class="info-box"
           >
             <div
@@ -25,7 +32,11 @@
               <div v-if="infoBoxSecondaryText">
                 {{ infoBoxSecondaryText }}
               </div>
-              <template v-if="latestSubmissionIsFinished && latestSubmissionStatus === null">
+              <template
+                v-if="
+                  latestSubmissionIsFinished && latestSubmissionStatus === null && !isPublishing
+                "
+              >
                 <div
                   v-if="showingMoreDetails"
                   class="more-details-text"
@@ -50,7 +61,7 @@
             </div>
             <template #chip>
               <StatusChip
-                v-if="latestSubmissionStatus"
+                v-if="latestSubmissionStatus && !isPublishing"
                 :status="latestSubmissionStatus"
               />
             </template>
@@ -110,13 +121,13 @@
           <div class="country-area">
             <KTransition kind="component-fade-out-in">
               <div
-                v-if="latestSubmissionIsLoading"
+                v-if="latestSubmissionIsLoading || isPublishing"
                 class="loader-wrapper"
               >
                 <KCircularLoader disableDefaultTransition />
               </div>
               <CountryField
-                v-else-if="latestSubmissionIsFinished"
+                v-else-if="latestSubmissionIsFinished && !isPublishing"
                 v-model="countries"
                 class="country-field"
                 :disabled="!canBeEdited"
@@ -186,7 +197,7 @@
   import LanguagesMap from 'shared/leUtils/Languages';
   import LicensesMap from 'shared/leUtils/Licenses';
   import { CategoriesLookup, CommunityLibraryStatus } from 'shared/constants';
-  import { CommunityLibrarySubmission } from 'shared/data/resources';
+  import { CommunityLibrarySubmission, Channel } from 'shared/data/resources';
 
   export default {
     name: 'SubmitToCommunityLibrarySidePanel',
@@ -229,6 +240,7 @@
         submittedSnackbar$,
         errorSnackbar$,
         submittingSnackbar$,
+        publishingMessage$,
       } = communityChannelsStrings;
 
       const annotationColor = computed(() => tokensTheme.annotation);
@@ -237,6 +249,26 @@
       const showingMoreDetails = ref(false);
       const countries = ref([]);
       const description = ref('');
+      const isPublishing = ref(Boolean(props.channel.publishing));
+      const currentChannelVersion = ref(props.channel.version);
+
+      let publishPollId = null;
+      function startPublishPolling() {
+        if (publishPollId || !isPublishing.value) return;
+        publishPollId = setInterval(() => {
+          Channel.fetchModel(props.channel.id).then(ch => {
+            if (ch) {
+              isPublishing.value = Boolean(ch.publishing);
+              if (!isPublishing.value) {
+                currentChannelVersion.value = ch.version;
+                clearInterval(publishPollId);
+                publishPollId = null;
+              }
+            }
+          });
+        }, 2000);
+      }
+      if (isPublishing.value) startPublishPolling();
 
       const {
         isLoading: latestSubmissionIsLoading,
@@ -310,16 +342,22 @@
       const isPublic = computed(() => props.channel.public);
       const isCurrentVersionAlreadySubmitted = computed(() => {
         if (!latestSubmissionData.value) return false;
-        return latestSubmissionData.value.channel_version === props.channel.version;
+        return latestSubmissionData.value.channel_version === currentChannelVersion.value;
       });
 
-      const canBeEdited = computed(
-        () => isPublished.value && !isPublic.value && !isCurrentVersionAlreadySubmitted.value,
-      );
+      const canBeEdited = computed(() => {
+        if (isPublishing.value) return false;
+        return isPublished.value && !isPublic.value && !isCurrentVersionAlreadySubmitted.value;
+      });
 
-      const canBeSubmitted = computed(
-        () => canBeEdited.value && publishedDataIsFinished.value && description.value.length >= 1,
-      );
+      const canBeSubmitted = computed(() => {
+        return (
+          canBeEdited.value &&
+          !isPublishing.value &&
+          publishedDataIsFinished.value &&
+          description.value.length >= 1
+        );
+      });
 
       const {
         isLoading: publishedDataIsLoading,
@@ -330,7 +368,7 @@
       const latestPublishedData = computed(() => {
         if (!publishedData.value) return undefined;
 
-        return publishedData.value[props.channel.version];
+        return publishedData.value[currentChannelVersion.value];
       });
 
       const detectedLanguages = computed(() => {
@@ -388,6 +426,10 @@
       }
 
       function onSubmit() {
+        if (isPublishing.value) {
+          showSnackbar({ text: submittingSnackbar$() });
+          return;
+        }
         // It should be possible to undo a submission within a short time window
         // in case the user made a mistake and wants to change something.
         // To avoid having to deal with undoing logic, we simply show a "submitting"
@@ -460,6 +502,8 @@
         alreadySubmittedWarning$,
         submitButton$,
         cancelAction$,
+        isPublishing,
+        publishingMessage$,
       };
     },
     props: {
@@ -538,4 +582,21 @@
     max-width: 100%;
   }
 
+  .publishing-loader {
+    position: static;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: max-content;
+    margin: 0 auto;
+  }
+
+  .publishing-text {
+    font-size: 14px;
+  }
+
+  .publishing-loader > *:first-child {
+    margin-right: 2px;
+  }
+
 </style>
diff --git a/contentcuration/contentcuration/frontend/shared/strings/communityChannelsStrings.js b/contentcuration/contentcuration/frontend/shared/strings/communityChannelsStrings.js
index 43762612be..785c88b2fe 100644
--- a/contentcuration/contentcuration/frontend/shared/strings/communityChannelsStrings.js
+++ b/contentcuration/contentcuration/frontend/shared/strings/communityChannelsStrings.js
@@ -86,6 +86,11 @@ export const communityChannelsStrings = createTranslator('CommunityChannelsStrin
     message: 'Submit to Community Library',
     context: 'The title of the "Submit to Community Library" panel',
   },
+  publishingMessage: {
+    message: 'Channel is being published',
+    context:
+      'Shown in the Submit to Community Library side panel when the channel is currently publishing',
+  },
   submittedPrimaryInfo: {
     message: 'A previous version is still pending review.',
     context:
diff --git a/contentcuration/contentcuration/tests/viewsets/test_community_library_submission.py b/contentcuration/contentcuration/tests/viewsets/test_community_library_submission.py
index 10c7e56dd1..55f2269d3e 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_community_library_submission.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_community_library_submission.py
@@ -166,6 +166,26 @@ def test_create_submission__explicit_channel_version(self):
         # The explicitly set channel version should be ignored by the serializer
         self.assertEqual(created_submission.channel_version, 1)
 
+    def test_create_submission__publishing_channel(self):
+        self.client.force_authenticate(user=self.editor_user)
+
+        submission_metadata = self.new_submission_metadata
+
+        # Mark the channel referenced by the metadata as publishing
+        from contentcuration.models import Channel
+        from contentcuration.models import ContentNode
+
+        channel = Channel.objects.get(id=submission_metadata["channel"])
+        # Ensure main_tree exists; mark its publishing flag
+        main_tree = channel.main_tree or ContentNode.objects.get(id=channel.main_tree_id)
+        main_tree.publishing = True
+        main_tree.save()
+
+        response = self.client.post(
+            reverse("community-library-submission-list"), submission_metadata, format="json"
+        )
+        self.assertEqual(response.status_code, 400, response.content)
+
     def test_list_submissions__is_editor(self):
         self.client.force_authenticate(user=self.editor_user)
         response = self.client.get(
diff --git a/contentcuration/contentcuration/viewsets/community_library_submission.py b/contentcuration/contentcuration/viewsets/community_library_submission.py
index 771e0afd34..abaf1c8521 100644
--- a/contentcuration/contentcuration/viewsets/community_library_submission.py
+++ b/contentcuration/contentcuration/viewsets/community_library_submission.py
@@ -54,6 +54,12 @@ def create(self, validated_data):
         channel = validated_data["channel"]
         user = self.context["request"].user
 
+        # Prevent creating submissions while a publish is in progress
+        if getattr(getattr(channel, "main_tree", None), "publishing", False):
+            raise ValidationError(
+                "Cannot create a community library submission while the channel is being published."
+            )
+
         if channel.version == 0:
             # The channel is not published
             raise ValidationError(

From 1a7b5c59bb0384bb7b9b8ef58b81e42f6c954933 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci-lite[bot]"
 <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Date: Thu, 30 Oct 2025 22:51:15 +0000
Subject: [PATCH 2/4] [pre-commit.ci lite] apply automatic fixes

---
 .../__tests__/SubmitToCommunityLibrarySidePanel.spec.js   | 2 +-
 .../tests/viewsets/test_community_library_submission.py   | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/__tests__/SubmitToCommunityLibrarySidePanel.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/__tests__/SubmitToCommunityLibrarySidePanel.spec.js
index 18c1cda437..573e3ff1f9 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/__tests__/SubmitToCommunityLibrarySidePanel.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/__tests__/SubmitToCommunityLibrarySidePanel.spec.js
@@ -311,7 +311,7 @@ describe('SubmitToCommunityLibrarySidePanel', () => {
 
       const descriptionTextbox = wrapper.findComponent('.description-textbox');
       expect(descriptionTextbox.props('disabled')).toBe(false);
-      
+
       await descriptionTextbox.vm.$emit('input', 'Some description');
       await wrapper.vm.$nextTick();
       const submitButton = wrapper.find('[data-test="submit-button"]');
diff --git a/contentcuration/contentcuration/tests/viewsets/test_community_library_submission.py b/contentcuration/contentcuration/tests/viewsets/test_community_library_submission.py
index 55f2269d3e..acb73dd6e5 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_community_library_submission.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_community_library_submission.py
@@ -177,12 +177,16 @@ def test_create_submission__publishing_channel(self):
 
         channel = Channel.objects.get(id=submission_metadata["channel"])
         # Ensure main_tree exists; mark its publishing flag
-        main_tree = channel.main_tree or ContentNode.objects.get(id=channel.main_tree_id)
+        main_tree = channel.main_tree or ContentNode.objects.get(
+            id=channel.main_tree_id
+        )
         main_tree.publishing = True
         main_tree.save()
 
         response = self.client.post(
-            reverse("community-library-submission-list"), submission_metadata, format="json"
+            reverse("community-library-submission-list"),
+            submission_metadata,
+            format="json",
         )
         self.assertEqual(response.status_code, 400, response.content)
 

From f3540aab8698de49410b121173bcd4241584f472 Mon Sep 17 00:00:00 2001
From: taoerman <qiliu0523@gmail.com>
Date: Fri, 7 Nov 2025 14:50:51 -0800
Subject: [PATCH 3/4] fix bug

---
 .../SubmitToCommunityLibrarySidePanel.spec.js |  19 ++-
 .../index.vue                                 | 136 ++++++------------
 .../channelEdit/composables/useFetch.js       |   5 +-
 .../contentcuration/viewsets/channel.py       |   1 +
 4 files changed, 65 insertions(+), 96 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/__tests__/SubmitToCommunityLibrarySidePanel.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/__tests__/SubmitToCommunityLibrarySidePanel.spec.js
index 248ed3e099..5d3d907f88 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/__tests__/SubmitToCommunityLibrarySidePanel.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/__tests__/SubmitToCommunityLibrarySidePanel.spec.js
@@ -37,6 +37,8 @@ const { nonePrimaryInfo$, flaggedPrimaryInfo$, approvedPrimaryInfo$, submittedPr
 async function makeWrapper({ channel, publishedData, latestSubmission }) {
   const isLoading = ref(true);
   const isFinished = ref(false);
+  const fetchPublishedData = jest.fn(() => Promise.resolve());
+  const fetchLatestSubmission = jest.fn(() => Promise.resolve());
 
   store.state.currentChannel.currentChannelId = channel.id;
   store.commit('channel/ADD_CHANNEL', channel);
@@ -45,12 +47,14 @@ async function makeWrapper({ channel, publishedData, latestSubmission }) {
     isLoading,
     isFinished,
     data: computed(() => publishedData),
+    fetchData: fetchPublishedData,
   });
 
   useLatestCommunityLibrarySubmission.mockReturnValue({
     isLoading,
     isFinished,
     data: computed(() => latestSubmission),
+    fetchData: fetchLatestSubmission,
   });
 
   const wrapper = mount(SubmitToCommunityLibrarySidePanel, {
@@ -299,9 +303,22 @@ describe('SubmitToCommunityLibrarySidePanel', () => {
       });
 
       const channel = { ...publishedNonPublicChannel, publishing: true };
-      const wrapper = await makeWrapper({ channel, publishedData, latestSubmission: null });
+      const publishedDataWithVersion3 = {
+        ...publishedData,
+        3: {
+          included_languages: ['en', null],
+          included_licenses: [1],
+          included_categories: [Categories.SCHOOL],
+        },
+      };
+      const wrapper = await makeWrapper({
+        channel,
+        publishedData: publishedDataWithVersion3,
+        latestSubmission: null,
+      });
 
       const updatedChannel = { ...channel, publishing: false, version: 3 };
+      await wrapper.setProps({ channel: updatedChannel });
       store.commit('channel/ADD_CHANNEL', updatedChannel);
 
       await wrapper.vm.$nextTick();
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/index.vue
index 34a3b86130..ecd7bc376b 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/index.vue
@@ -107,8 +107,8 @@
             <div class="channel-title">
               {{
                 channelVersion$({
-                  name: currentChannel ? currentChannel.name : '',
-                  version: currentChannel ? currentChannel.version : 0,
+                  name: channel ? channel.name : '',
+                  version: displayedVersion,
                 })
               }}
             </div>
@@ -201,9 +201,8 @@
 
 <script>
 
-  import { computed, getCurrentInstance, onUnmounted, ref, watch } from 'vue';
+  import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue';
   import { themeTokens, themePalette } from 'kolibri-design-system/lib/styles/theme';
-  import { liveQuery } from 'dexie';
 
   import camelCase from 'lodash/camelCase';
 
@@ -216,7 +215,7 @@
   import { translateMetadataString } from 'shared/utils/metadataStringsTranslation';
   import countriesUtil from 'shared/utils/countries';
   import { communityChannelsStrings } from 'shared/strings/communityChannelsStrings';
-  import { Channel, CommunityLibrarySubmission } from 'shared/data/resources';
+  import { CommunityLibrarySubmission } from 'shared/data/resources';
 
   import SidePanelModal from 'shared/views/SidePanelModal';
   import CountryField from 'shared/views/form/CountryField';
@@ -240,9 +239,6 @@
       const { proxy } = getCurrentInstance();
       const store = proxy.$store;
 
-      // Get currentChannel from store reactively - this will update when store changes
-      const currentChannel = computed(() => store.getters['currentChannel/currentChannel']);
-
       // Destructure translation functions from communityChannelsStrings
       const {
         submitToCommunityLibrary$,
@@ -278,74 +274,15 @@
       const showingMoreDetails = ref(false);
       const countries = ref([]);
       const description = ref('');
-      const isPublishing = ref(Boolean(props.channel.publishing));
-      const currentChannelVersion = ref(props.channel.version);
+      const isPublishing = computed(() => props.channel?.publishing === true);
+      const currentChannelVersion = computed(() => props.channel?.version);
       const replacementConfirmed = ref(false);
 
-      // Monitor publishing completion using liveQuery to watch channel's publishing property
-      let publishSubscription = null;
-      let publishTimeout = null;
-
-      function startPublishMonitoring() {
-        if (publishSubscription || !isPublishing.value) return;
-
-        if (!Channel.table || !Channel.table.get) return;
-
-        const observable = liveQuery(() => {
-          return Channel.table.get(props.channel.id);
-        });
-
-        publishSubscription = observable.subscribe({
-          next: async channel => {
-            if (channel && !channel.publishing) {
-              stopPublishMonitoring();
-              isPublishing.value = false;
-              currentChannelVersion.value = channel.version;
-              await store.dispatch('channel/loadChannel', props.channel.id);
-            }
-          },
-        });
-
-        publishTimeout = setTimeout(() => {
-          stopPublishMonitoring();
-        }, 300000);
-      }
-
-      function stopPublishMonitoring() {
-        if (publishSubscription) {
-          publishSubscription.unsubscribe();
-          publishSubscription = null;
-        }
-        if (publishTimeout) {
-          clearTimeout(publishTimeout);
-          publishTimeout = null;
-        }
-      }
-
-      if (isPublishing.value) {
-        startPublishMonitoring();
-      }
-
-      watch(
-        () => currentChannel.value?.publishing,
-        (newPublishing, oldPublishing) => {
-          isPublishing.value = Boolean(newPublishing);
-          if (newPublishing && !oldPublishing) {
-            startPublishMonitoring();
-          } else if (!newPublishing && oldPublishing) {
-            stopPublishMonitoring();
-          }
-        },
-      );
-
-      onUnmounted(() => {
-        stopPublishMonitoring();
-      });
-
       const {
         isLoading: latestSubmissionIsLoading,
         isFinished: latestSubmissionIsFinished,
         data: latestSubmissionData,
+        fetchData: fetchLatestSubmission,
       } = useLatestCommunityLibrarySubmission(props.channel.id);
 
       function countryCodeToName(code) {
@@ -405,8 +342,8 @@
 
       const infoText = computed(() => infoConfig.value?.primaryText);
 
-      const isPublished = computed(() => currentChannel.value?.published);
-      const isPublic = computed(() => currentChannel.value?.public);
+      const isPublished = computed(() => props.channel?.published);
+      const isPublic = computed(() => props.channel?.public);
       const isCurrentVersionAlreadySubmitted = computed(() => {
         if (!latestSubmissionData.value) return false;
         return latestSubmissionData.value.channel_version === currentChannelVersion.value;
@@ -447,26 +384,45 @@
         isLoading: publishedDataIsLoading,
         isFinished: publishedDataIsFinished,
         data: publishedData,
+        fetchData: fetchPublishedData,
       } = usePublishedData(props.channel.id);
 
-      // Watch for when publishing completes and reload channel from backend
-      watch(
-        () => currentChannel.value?.publishing,
-        async (isPublishing, wasPublishing) => {
-          if (wasPublishing === true && isPublishing === false && props.channel.id) {
-            const ch = await Channel.fetchModel(props.channel.id);
-            if (ch) {
-              currentChannelVersion.value = ch.version;
-            }
-            await store.dispatch('channel/loadChannel', props.channel.id);
-          }
-        },
-      );
+      // Use the latest version available from either channel or publishedData
+      const displayedVersion = computed(() => {
+        const channelVersion = currentChannelVersion.value || 0;
+        if (publishedData.value && Object.keys(publishedData.value).length > 0) {
+          const publishedVersions = Object.keys(publishedData.value).map(v => parseInt(v, 10));
+          const maxPublishedVersion = Math.max(...publishedVersions);
+          return Math.max(channelVersion, maxPublishedVersion);
+        }
+        return channelVersion;
+      });
 
       const latestPublishedData = computed(() => {
-        if (!publishedData.value) return undefined;
+        if (!publishedData.value || !displayedVersion.value) return undefined;
+        return publishedData.value[displayedVersion.value];
+      });
 
-        return publishedData.value[currentChannelVersion.value];
+      // Watch for when publishing completes - fetch publishedData to get the new version's data
+      watch(isPublishing, async (newIsPublishing, oldIsPublishing) => {
+        if (oldIsPublishing === true && newIsPublishing === false) {
+          await fetchPublishedData();
+        }
+      });
+
+      // Watch for version changes and refetch publishedData
+      watch(currentChannelVersion, (newVersion, oldVersion) => {
+        if (newVersion && newVersion !== oldVersion) {
+          fetchPublishedData();
+        }
+      });
+
+      onMounted(async () => {
+        await fetchLatestSubmission();
+
+        if (!isPublishing.value) {
+          await fetchPublishedData();
+        }
       });
 
       const detectedLanguages = computed(() => {
@@ -514,10 +470,6 @@
       }
 
       function onSubmit() {
-        if (isPublishing.value) {
-          showSnackbar({ text: submittingSnackbar$() });
-          return;
-        }
         // It should be possible to undo a submission within a short time window
         // in case the user made a mistake and wants to change something.
         // To avoid having to deal with undoing logic, we simply show a "submitting"
@@ -553,7 +505,6 @@
       }
 
       return {
-        currentChannel,
         annotationColor,
         infoTextColor,
         showingMoreDetails,
@@ -570,6 +521,7 @@
         isPublic,
         isCurrentVersionAlreadySubmitted,
         canBeEdited,
+        displayedVersion,
         canBeSubmitted,
         publishedDataIsLoading,
         publishedDataIsFinished,
diff --git a/contentcuration/contentcuration/frontend/channelEdit/composables/useFetch.js b/contentcuration/contentcuration/frontend/channelEdit/composables/useFetch.js
index eadf93ed35..7fef1922c8 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/composables/useFetch.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/composables/useFetch.js
@@ -1,7 +1,7 @@
 import { ref } from 'vue';
 
 export function useFetch({ asyncFetchFunc }) {
-  const isLoading = ref(true);
+  const isLoading = ref(false);
   const isFinished = ref(false);
   const data = ref(null);
   const error = ref(null);
@@ -22,7 +22,6 @@ export function useFetch({ asyncFetchFunc }) {
       isLoading.value = false;
     }
   }
-  fetchData();
 
-  return { isLoading, isFinished, data, error };
+  return { isLoading, isFinished, data, error, fetchData };
 }
diff --git a/contentcuration/contentcuration/viewsets/channel.py b/contentcuration/contentcuration/viewsets/channel.py
index 78b76bfa70..7ef13f8934 100644
--- a/contentcuration/contentcuration/viewsets/channel.py
+++ b/contentcuration/contentcuration/viewsets/channel.py
@@ -573,6 +573,7 @@ def publish(self, pk, version_notes="", language=None):
                             {
                                 "published": True,
                                 "publishing": False,
+                                "version": channel.version,
                                 "primary_token": channel.get_human_token().token,
                                 "last_published": channel.last_published,
                                 "unpublished_changes": _unpublished_changes_query(

From 0d8c949b055cbdd70b5c2b9ba15a15922662fc5f Mon Sep 17 00:00:00 2001
From: taoerman <qiliu0523@gmail.com>
Date: Wed, 12 Nov 2025 09:42:46 -0800
Subject: [PATCH 4/4] remove redundant code

---
 .../sidePanels/SubmitToCommunityLibrarySidePanel/index.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/index.vue
index ecd7bc376b..7b08ee54e8 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/index.vue
@@ -410,13 +410,6 @@
         }
       });
 
-      // Watch for version changes and refetch publishedData
-      watch(currentChannelVersion, (newVersion, oldVersion) => {
-        if (newVersion && newVersion !== oldVersion) {
-          fetchPublishedData();
-        }
-      });
-
       onMounted(async () => {
         await fetchLatestSubmission();