From ece9e9cd2eaae1489d2814652ab6b1eac48fdca7 Mon Sep 17 00:00:00 2001
From: taoerman <qiliu0523@gmail.com>
Date: Fri, 7 Nov 2025 08:34:25 -0800
Subject: [PATCH 01/10] Show resubmit channel to community library CTA after
 channel publish

---
 .../modals/ResubmitChannelModal.vue           | 162 ++++++++++++++++++
 .../sidePanels/PublishSidePanel.vue           |   4 +-
 .../views/TreeView/TreeViewBase.vue           |  47 +++++
 .../strings/communityChannelsStrings.js       |  24 +++
 4 files changed, 236 insertions(+), 1 deletion(-)
 create mode 100644 contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
new file mode 100644
index 0000000000..703de8c2d5
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
@@ -0,0 +1,162 @@
+<template>
+
+  <KModal
+    v-if="value"
+    :title="title"
+    data-test="resubmit-modal"
+    @cancel="handleDismiss"
+  >
+    <div class="resubmit-modal-content">
+      <p class="resubmit-modal-description">{{ description }}</p>
+      <p class="resubmit-modal-question">{{ question }}</p>
+    </div>
+
+    <template #actions>
+      <div class="resubmit-modal-actions">
+        <KButton
+          class="resubmit-modal-dismiss-btn"
+          :style="dismissButtonStyles"
+          data-test="dismiss-button"
+          @click="handleDismiss"
+        >
+          {{ dismissButtonText }}
+        </KButton>
+        <KButton
+          class="resubmit-modal-resubmit-btn"
+          primary
+          data-test="resubmit-button"
+          @click="handleResubmit"
+        >
+          {{ resubmitButtonText }}
+        </KButton>
+      </div>
+    </template>
+  </KModal>
+
+</template>
+
+
+<script>
+
+  import { communityChannelsStrings } from 'shared/strings/communityChannelsStrings';
+
+  export default {
+    name: 'ResubmitChannelModal',
+    props: {
+      value: {
+        type: Boolean,
+        default: false,
+      },
+      channel: {
+        type: Object,
+        required: true,
+        validator(value) {
+          return value && typeof value.name === 'string' && typeof value.version === 'number';
+        },
+      },
+    },
+    computed: {
+      title() {
+        return communityChannelsStrings.resubmitModalTitle$();
+      },
+      description() {
+        return communityChannelsStrings.resubmitModalBodyFirst$({
+          channelName: this.channel.name,
+          version: this.channel.version,
+        });
+      },
+      question() {
+        return communityChannelsStrings.resubmitModalBodySecond$();
+      },
+      dismissButtonText() {
+        return communityChannelsStrings.dismissButton$();
+      },
+      resubmitButtonText() {
+        return communityChannelsStrings.resubmitButton$();
+      },
+      dismissButtonStyles() {
+        return {
+            color: this.$themeTokens.primary,
+            backgroundColor: this.$themePalette.grey.v_100,
+            '--hover-bg-color': this.$themePalette.grey.v_200,
+        };
+      },
+    },
+    methods: {
+      handleDismiss() {
+        this.$emit('dismiss');
+        this.$emit('input', false);
+      },
+      handleResubmit() {
+        this.$emit('resubmit');
+        this.$emit('input', false);
+      },
+    },
+  };
+
+</script>
+
+
+<style lang="scss">
+  [data-test="resubmit-modal"],
+  [data-test="resubmit-modal"] > *,
+  [data-test="resubmit-modal"] [role="dialog"],
+  [data-test="resubmit-modal"] .KModal,
+  [data-test="resubmit-modal"] .modal {
+    width: 500px !important;
+    max-width: 500px !important;
+    max-height: 284px !important;
+  }
+
+  [data-test="resubmit-modal"] h1,
+  [data-test="resubmit-modal"] h2,
+  [data-test="resubmit-modal"] h3,
+  [data-test="resubmit-modal"] h4,
+  [data-test="resubmit-modal"] .modal-title,
+  [data-test="resubmit-modal"] [class*="title"] {
+    width: 452px;
+    height: 52px;
+    font-family: 'Noto Sans', sans-serif;
+    font-size: 20px;
+    font-weight: 600;
+    line-height: 130%;
+    letter-spacing: 0%;
+    vertical-align: middle;
+  }
+
+  .resubmit-modal-content {
+    padding: 8px 0;
+    margin-top: 35px;
+  }
+
+  .resubmit-modal-description,
+  .resubmit-modal-question {
+    width: 100%;
+    min-height: 40px;
+    padding: 0;
+    margin: 0;
+    font-family: 'Noto Sans', sans-serif;
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 140%;
+    letter-spacing: 0%;
+    vertical-align: middle;
+  }
+
+  .resubmit-modal-actions {
+    display: flex;
+    justify-content: flex-end;
+    width: 452px;
+    min-height: 40px;
+    gap: 10px;
+    padding-top: 16px;
+  }
+
+  .resubmit-modal-dismiss-btn:hover {
+    background-color: var(--hover-bg-color) !important;
+  }
+
+  .resubmit-modal-resubmit-btn {
+    height: 40px;
+  }
+</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
index 9c0027442d..8d9fac95c4 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
@@ -328,6 +328,8 @@
               });
             }
 
+            emit('published', { channelId: currentChannel.value.id });
+
             await Channel.publish(currentChannel.value.id, version_notes.value);
 
             emit('close');
@@ -402,7 +404,7 @@
       };
     },
 
-    emits: ['close'],
+    emits: ['close', 'published'],
   };
 
 </script>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
index 6ca82f5d2d..527c532317 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
@@ -235,12 +235,20 @@
     <PublishSidePanel
       v-if="showPublishSidePanel"
       @close="showPublishSidePanel = false"
+      @published="handleChannelPublished"
     />
     <SubmitToCommunityLibrarySidePanel
       v-if="showSubmitToCommunityLibrarySidePanel"
       :channel="currentChannel"
       @close="showSubmitToCommunityLibrarySidePanel = false"
     />
+    <ResubmitChannelModal
+      v-if="resubmitModalChannel || currentChannel"
+      v-model="showResubmitModal"
+      :channel="resubmitModalChannel || currentChannel"
+      @resubmit="handleResubmit"
+      @dismiss="handleDismissResubmit"
+    />
     <template v-if="isPublished">
       <ChannelTokenModal
         v-model="showTokenModal"
@@ -349,6 +357,8 @@
   import { DraggableRegions, DraggableUniverses, RouteNames } from '../../constants';
   import PublishSidePanel from '../../components/sidePanels/PublishSidePanel';
   import SubmitToCommunityLibrarySidePanel from '../../components/sidePanels/SubmitToCommunityLibrarySidePanel';
+  import ResubmitChannelModal from '../../components/modals/ResubmitChannelModal';
+  import { Channel, CommunityLibrarySubmission } from 'shared/data/resources';
   import MainNavigationDrawer from 'shared/views/MainNavigationDrawer';
   import ToolBar from 'shared/views/ToolBar';
   import ChannelTokenModal from 'shared/views/channel/ChannelTokenModal';
@@ -369,6 +379,7 @@
       ToolBar,
       PublishSidePanel,
       SubmitToCommunityLibrarySidePanel,
+      ResubmitChannelModal,
       ProgressModal,
       ChannelTokenModal,
       SyncResourcesModal,
@@ -392,11 +403,13 @@
         drawer: false,
         showPublishSidePanel: false,
         showSubmitToCommunityLibrarySidePanel: false,
+        showResubmitModal: false,
         showTokenModal: false,
         showSyncModal: false,
         showClipboard: false,
         showDeleteModal: false,
         syncing: false,
+        resubmitModalChannel: null,
       };
     },
     computed: {
@@ -546,6 +559,40 @@
         this.showPublishSidePanel = true;
         this.trackClickEvent('Publish');
       },
+      handleResubmit() {
+        this.showResubmitModal = false;
+        this.showSubmitToCommunityLibrarySidePanel = true;
+      },
+      handleDismissResubmit() {
+        this.showResubmitModal = false;
+        this.resubmitModalChannel = null;
+      },
+      async handleChannelPublished({ channelId }) {
+        if (!channelId || !this.currentChannel || this.currentChannel.id !== channelId) {
+          return;
+        }
+
+        const response = await CommunityLibrarySubmission.fetchCollection({
+          channel: channelId,
+          max_results: 1,
+        });
+
+        let submissions = [];
+        if (Array.isArray(response)) {
+          submissions = response;
+        } else if (response && response.results && Array.isArray(response.results)) {
+          submissions = response.results;
+        }
+
+        if (submissions.length > 0) {
+          const latestSubmission = submissions[0];
+          this.resubmitModalChannel = {
+            ...this.currentChannel,
+            version: latestSubmission.channel_version,
+          };
+          this.showResubmitModal = true;
+        }
+      },
       trackClickEvent(eventLabel) {
         this.$analytics.trackClick('channel_editor_toolbar', eventLabel);
       },
diff --git a/contentcuration/contentcuration/frontend/shared/strings/communityChannelsStrings.js b/contentcuration/contentcuration/frontend/shared/strings/communityChannelsStrings.js
index 6ef0ac77c7..51ea2e0ab6 100644
--- a/contentcuration/contentcuration/frontend/shared/strings/communityChannelsStrings.js
+++ b/contentcuration/contentcuration/frontend/shared/strings/communityChannelsStrings.js
@@ -208,4 +208,28 @@ export const communityChannelsStrings = createTranslator('CommunityChannelsStrin
     message: 'I understand this will replace my earlier submission on the review queue',
     context: 'Checkbox text shown when there is a pending submission to confirm replacement',
   },
+  resubmitModalTitle: {
+    message: 'Resubmit channel for Community library review?',
+    context:
+      'Title of the modal shown after publishing a channel that already has Community Library submissions',
+  },
+  resubmitModalBodyFirst: {
+    message: '{channelName} v{version} is also published to the Community Library.',
+    context:
+      'First sentence of the body text of the modal shown after publishing a channel that already has Community Library submissions',
+  },
+  resubmitModalBodySecond: {
+    message:
+      'Would you like to resubmit this version with your changes for community library review?',
+    context:
+      'Second sentence of the body text of the modal shown after publishing a channel that already has Community Library submissions',
+  },
+  resubmitButton: {
+    message: 'RESUBMIT',
+    context: 'Button in the resubmit modal to open the submit to Community Library side panel',
+  },
+  dismissButton: {
+    message: 'DISMISS',
+    context: 'Button in the resubmit modal to dismiss the modal',
+  },
 });

From 4a2948a8258c55cd90b7f93cf800e3e1e6aae4b7 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci-lite[bot]"
 <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Date: Fri, 7 Nov 2025 16:40:58 +0000
Subject: [PATCH 02/10] [pre-commit.ci lite] apply automatic fixes

---
 .../modals/ResubmitChannelModal.vue           | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
index 703de8c2d5..a6c2871791 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
@@ -76,9 +76,9 @@
       },
       dismissButtonStyles() {
         return {
-            color: this.$themeTokens.primary,
-            backgroundColor: this.$themePalette.grey.v_100,
-            '--hover-bg-color': this.$themePalette.grey.v_200,
+          color: this.$themeTokens.primary,
+          backgroundColor: this.$themePalette.grey.v_100,
+          '--hover-bg-color': this.$themePalette.grey.v_200,
         };
       },
     },
@@ -98,22 +98,23 @@
 
 
 <style lang="scss">
-  [data-test="resubmit-modal"],
-  [data-test="resubmit-modal"] > *,
-  [data-test="resubmit-modal"] [role="dialog"],
-  [data-test="resubmit-modal"] .KModal,
-  [data-test="resubmit-modal"] .modal {
+
+  [data-test='resubmit-modal'],
+  [data-test='resubmit-modal'] > *,
+  [data-test='resubmit-modal'] [role='dialog'],
+  [data-test='resubmit-modal'] .KModal,
+  [data-test='resubmit-modal'] .modal {
     width: 500px !important;
     max-width: 500px !important;
     max-height: 284px !important;
   }
 
-  [data-test="resubmit-modal"] h1,
-  [data-test="resubmit-modal"] h2,
-  [data-test="resubmit-modal"] h3,
-  [data-test="resubmit-modal"] h4,
-  [data-test="resubmit-modal"] .modal-title,
-  [data-test="resubmit-modal"] [class*="title"] {
+  [data-test='resubmit-modal'] h1,
+  [data-test='resubmit-modal'] h2,
+  [data-test='resubmit-modal'] h3,
+  [data-test='resubmit-modal'] h4,
+  [data-test='resubmit-modal'] .modal-title,
+  [data-test='resubmit-modal'] [class*='title'] {
     width: 452px;
     height: 52px;
     font-family: 'Noto Sans', sans-serif;
@@ -145,10 +146,10 @@
 
   .resubmit-modal-actions {
     display: flex;
+    gap: 10px;
     justify-content: flex-end;
     width: 452px;
     min-height: 40px;
-    gap: 10px;
     padding-top: 16px;
   }
 
@@ -159,4 +160,5 @@
   .resubmit-modal-resubmit-btn {
     height: 40px;
   }
+
 </style>

From 305e3e8285b0813869b98b517c4ad1fb94b60f5a Mon Sep 17 00:00:00 2001
From: taoerman <qiliu0523@gmail.com>
Date: Mon, 17 Nov 2025 09:39:38 -0800
Subject: [PATCH 03/10] fix code

---
 .../modals/ResubmitChannelModal.vue           | 167 ++++--------------
 .../sidePanels/PublishSidePanel.vue           |  46 ++++-
 .../views/TreeView/TreeViewBase.vue           |  35 +---
 3 files changed, 88 insertions(+), 160 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
index a6c2871791..d9bc9cf936 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
@@ -3,162 +3,73 @@
   <KModal
     v-if="value"
     :title="title"
+    :submitText="resubmitButtonText"
+    :cancelText="dismissButtonText"
     data-test="resubmit-modal"
+    @submit="handleResubmit"
     @cancel="handleDismiss"
   >
     <div class="resubmit-modal-content">
       <p class="resubmit-modal-description">{{ description }}</p>
       <p class="resubmit-modal-question">{{ question }}</p>
     </div>
-
-    <template #actions>
-      <div class="resubmit-modal-actions">
-        <KButton
-          class="resubmit-modal-dismiss-btn"
-          :style="dismissButtonStyles"
-          data-test="dismiss-button"
-          @click="handleDismiss"
-        >
-          {{ dismissButtonText }}
-        </KButton>
-        <KButton
-          class="resubmit-modal-resubmit-btn"
-          primary
-          data-test="resubmit-button"
-          @click="handleResubmit"
-        >
-          {{ resubmitButtonText }}
-        </KButton>
-      </div>
-    </template>
   </KModal>
 
 </template>
 
 
-<script>
+<script setup>
 
+  import { computed } from 'vue';
   import { communityChannelsStrings } from 'shared/strings/communityChannelsStrings';
 
-  export default {
-    name: 'ResubmitChannelModal',
-    props: {
-      value: {
-        type: Boolean,
-        default: false,
-      },
-      channel: {
-        type: Object,
-        required: true,
-        validator(value) {
-          return value && typeof value.name === 'string' && typeof value.version === 'number';
-        },
-      },
+  const props = defineProps({
+    value: {
+      type: Boolean,
+      default: false,
     },
-    computed: {
-      title() {
-        return communityChannelsStrings.resubmitModalTitle$();
-      },
-      description() {
-        return communityChannelsStrings.resubmitModalBodyFirst$({
-          channelName: this.channel.name,
-          version: this.channel.version,
-        });
-      },
-      question() {
-        return communityChannelsStrings.resubmitModalBodySecond$();
-      },
-      dismissButtonText() {
-        return communityChannelsStrings.dismissButton$();
-      },
-      resubmitButtonText() {
-        return communityChannelsStrings.resubmitButton$();
-      },
-      dismissButtonStyles() {
-        return {
-          color: this.$themeTokens.primary,
-          backgroundColor: this.$themePalette.grey.v_100,
-          '--hover-bg-color': this.$themePalette.grey.v_200,
-        };
+    channel: {
+      type: Object,
+      required: true,
+      validator(value) {
+        return value && typeof value.name === 'string' && typeof value.version === 'number';
       },
     },
-    methods: {
-      handleDismiss() {
-        this.$emit('dismiss');
-        this.$emit('input', false);
-      },
-      handleResubmit() {
-        this.$emit('resubmit');
-        this.$emit('input', false);
-      },
+    latestSubmissionVersion: {
+      type: Number,
+      default: null,
     },
-  };
+  });
 
-</script>
+  const emit = defineEmits(['dismiss', 'resubmit', 'input']);
 
+  const title = computed(() => communityChannelsStrings.resubmitModalTitle$());
 
-<style lang="scss">
+  const publishedVersion = computed(() => {
+    return props.latestSubmissionVersion;
+  });
 
-  [data-test='resubmit-modal'],
-  [data-test='resubmit-modal'] > *,
-  [data-test='resubmit-modal'] [role='dialog'],
-  [data-test='resubmit-modal'] .KModal,
-  [data-test='resubmit-modal'] .modal {
-    width: 500px !important;
-    max-width: 500px !important;
-    max-height: 284px !important;
-  }
+  const description = computed(() =>
+    communityChannelsStrings.resubmitModalBodyFirst$({
+      channelName: props.channel.name,
+      version: publishedVersion.value,
+    }),
+  );
 
-  [data-test='resubmit-modal'] h1,
-  [data-test='resubmit-modal'] h2,
-  [data-test='resubmit-modal'] h3,
-  [data-test='resubmit-modal'] h4,
-  [data-test='resubmit-modal'] .modal-title,
-  [data-test='resubmit-modal'] [class*='title'] {
-    width: 452px;
-    height: 52px;
-    font-family: 'Noto Sans', sans-serif;
-    font-size: 20px;
-    font-weight: 600;
-    line-height: 130%;
-    letter-spacing: 0%;
-    vertical-align: middle;
-  }
+  const question = computed(() => communityChannelsStrings.resubmitModalBodySecond$());
 
-  .resubmit-modal-content {
-    padding: 8px 0;
-    margin-top: 35px;
-  }
+  const dismissButtonText = computed(() => communityChannelsStrings.dismissButton$());
 
-  .resubmit-modal-description,
-  .resubmit-modal-question {
-    width: 100%;
-    min-height: 40px;
-    padding: 0;
-    margin: 0;
-    font-family: 'Noto Sans', sans-serif;
-    font-size: 14px;
-    font-weight: 400;
-    line-height: 140%;
-    letter-spacing: 0%;
-    vertical-align: middle;
-  }
-
-  .resubmit-modal-actions {
-    display: flex;
-    gap: 10px;
-    justify-content: flex-end;
-    width: 452px;
-    min-height: 40px;
-    padding-top: 16px;
-  }
+  const resubmitButtonText = computed(() => communityChannelsStrings.resubmitButton$());
 
-  .resubmit-modal-dismiss-btn:hover {
-    background-color: var(--hover-bg-color) !important;
+  function handleDismiss() {
+    emit('dismiss');
+    emit('input', false);
   }
 
-  .resubmit-modal-resubmit-btn {
-    height: 40px;
+  function handleResubmit() {
+    emit('resubmit');
+    emit('input', false);
   }
 
-</style>
+</script>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
index 8d9fac95c4..b85b1bb877 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
@@ -137,10 +137,16 @@
           </KButton>
           <KButton
             primary
-            :disabled="submitting || !isFormValid"
+            :disabled="submitting || checkingResubmit || !isFormValid"
             @click="submit"
           >
-            {{ submitText }}
+            <span
+              v-if="checkingResubmit"
+              class="loader-wrapper"
+            >
+              <KCircularLoader :size="16" />
+            </span>
+            <span v-else>{{ submitText }}</span>
           </KButton>
         </div>
       </template>
@@ -154,7 +160,7 @@
 
   import { ref, computed, getCurrentInstance, onMounted } from 'vue';
   import SidePanelModal from 'shared/views/SidePanelModal';
-  import { Channel } from 'shared/data/resources';
+  import { Channel, CommunityLibrarySubmission } from 'shared/data/resources';
   import { forceServerSync } from 'shared/data/serverSync';
   import { communityChannelsStrings } from 'shared/strings/communityChannelsStrings';
   import { LanguagesList } from 'shared/leUtils/Languages';
@@ -173,6 +179,7 @@
       const mode = ref(PublishModes.LIVE);
       const version_notes = ref('');
       const submitting = ref(false);
+      const checkingResubmit = ref(false);
       const language = ref({});
       const showLanguageInvalidText = ref(false);
       const showVersionNotesInvalidText = ref(false); // lazy validation
@@ -328,15 +335,41 @@
               });
             }
 
+            await Channel.publish(currentChannel.value.id, version_notes.value);
+
             emit('published', { channelId: currentChannel.value.id });
 
-            await Channel.publish(currentChannel.value.id, version_notes.value);
+            if (mode.value === PublishModes.LIVE) {
+              checkingResubmit.value = true;
+              try {
+                const response = await CommunityLibrarySubmission.fetchCollection({
+                  channel: currentChannel.value.id,
+                  max_results: 1, 
+                });
+
+                const submissions = response?.results || [];
+
+                if (submissions.length > 0) {
+                  const latestSubmission = submissions[0];
+                  emit('showResubmitCommunityLibraryModal', {
+                    channel: currentChannel.value ? { ...currentChannel.value } : null,
+                    latestSubmissionVersion: latestSubmission?.channel_version ?? null,
+                  });
+                }
+              } catch (error) {
+                store.dispatch('shared/handleAxiosError', error);
+              } finally {
+                checkingResubmit.value = false;
+                submitting.value = false;
+              }
+            } else {
+              submitting.value = false;
+            }
 
             emit('close');
           }
         } catch (error) {
           store.dispatch('shared/handleAxiosError', error);
-        } finally {
           submitting.value = false;
         }
       };
@@ -371,6 +404,7 @@
         mode,
         version_notes,
         submitting,
+        checkingResubmit,
         language,
         showLanguageInvalidText,
         showVersionNotesInvalidText,
@@ -404,7 +438,7 @@
       };
     },
 
-    emits: ['close', 'published'],
+    emits: ['close', 'published', 'showResubmitCommunityLibraryModal'],
   };
 
 </script>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
index 527c532317..163c839bd7 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
@@ -236,6 +236,7 @@
       v-if="showPublishSidePanel"
       @close="showPublishSidePanel = false"
       @published="handleChannelPublished"
+      @showResubmitCommunityLibraryModal="handleShowResubmitModal"
     />
     <SubmitToCommunityLibrarySidePanel
       v-if="showSubmitToCommunityLibrarySidePanel"
@@ -246,6 +247,7 @@
       v-if="resubmitModalChannel || currentChannel"
       v-model="showResubmitModal"
       :channel="resubmitModalChannel || currentChannel"
+      :latestSubmissionVersion="resubmitModalSubmissionVersion"
       @resubmit="handleResubmit"
       @dismiss="handleDismissResubmit"
     />
@@ -358,7 +360,7 @@
   import PublishSidePanel from '../../components/sidePanels/PublishSidePanel';
   import SubmitToCommunityLibrarySidePanel from '../../components/sidePanels/SubmitToCommunityLibrarySidePanel';
   import ResubmitChannelModal from '../../components/modals/ResubmitChannelModal';
-  import { Channel, CommunityLibrarySubmission } from 'shared/data/resources';
+  import { Channel } from 'shared/data/resources';
   import MainNavigationDrawer from 'shared/views/MainNavigationDrawer';
   import ToolBar from 'shared/views/ToolBar';
   import ChannelTokenModal from 'shared/views/channel/ChannelTokenModal';
@@ -410,6 +412,7 @@
         showDeleteModal: false,
         syncing: false,
         resubmitModalChannel: null,
+        resubmitModalSubmissionVersion: null,
       };
     },
     computed: {
@@ -566,32 +569,12 @@
       handleDismissResubmit() {
         this.showResubmitModal = false;
         this.resubmitModalChannel = null;
+        this.resubmitModalSubmissionVersion = null;
       },
-      async handleChannelPublished({ channelId }) {
-        if (!channelId || !this.currentChannel || this.currentChannel.id !== channelId) {
-          return;
-        }
-
-        const response = await CommunityLibrarySubmission.fetchCollection({
-          channel: channelId,
-          max_results: 1,
-        });
-
-        let submissions = [];
-        if (Array.isArray(response)) {
-          submissions = response;
-        } else if (response && response.results && Array.isArray(response.results)) {
-          submissions = response.results;
-        }
-
-        if (submissions.length > 0) {
-          const latestSubmission = submissions[0];
-          this.resubmitModalChannel = {
-            ...this.currentChannel,
-            version: latestSubmission.channel_version,
-          };
-          this.showResubmitModal = true;
-        }
+      handleShowResubmitModal({ channel, latestSubmissionVersion }) {
+        this.resubmitModalChannel = channel;
+        this.resubmitModalSubmissionVersion = latestSubmissionVersion || null;
+        this.showResubmitModal = true;
       },
       trackClickEvent(eventLabel) {
         this.$analytics.trackClick('channel_editor_toolbar', eventLabel);

From 98e811550de0bb9205921320382470f3de29fc12 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci-lite[bot]"
 <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Date: Mon, 17 Nov 2025 17:42:11 +0000
Subject: [PATCH 04/10] [pre-commit.ci lite] apply automatic fixes

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

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
index b85b1bb877..e378705834 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
@@ -344,7 +344,7 @@
               try {
                 const response = await CommunityLibrarySubmission.fetchCollection({
                   channel: currentChannel.value.id,
-                  max_results: 1, 
+                  max_results: 1,
                 });
 
                 const submissions = response?.results || [];

From 14a38ff8989c5ca27fd58eb0f21d310bc4402009 Mon Sep 17 00:00:00 2001
From: taoerman <qiliu0523@gmail.com>
Date: Mon, 17 Nov 2025 09:48:40 -0800
Subject: [PATCH 05/10] fix code

---
 .../modals/ResubmitChannelModal.vue           | 22 +++++++++----------
 .../sidePanels/PublishSidePanel.vue           |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
index d9bc9cf936..8bd047b1cf 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
@@ -24,17 +24,17 @@
   import { communityChannelsStrings } from 'shared/strings/communityChannelsStrings';
 
   const props = defineProps({
-    value: {
-      type: Boolean,
-      default: false,
-    },
-    channel: {
-      type: Object,
-      required: true,
-      validator(value) {
-        return value && typeof value.name === 'string' && typeof value.version === 'number';
+      value: {
+        type: Boolean,
+        default: false,
+      },
+      channel: {
+        type: Object,
+        required: true,
+        validator(value) {
+          return value && typeof value.name === 'string' && typeof value.version === 'number';
+        },
       },
-    },
     latestSubmissionVersion: {
       type: Number,
       default: null,
@@ -46,7 +46,7 @@
   const title = computed(() => communityChannelsStrings.resubmitModalTitle$());
 
   const publishedVersion = computed(() => {
-    return props.latestSubmissionVersion;
+    return props.latestSubmissionVersion != null ? props.latestSubmissionVersion : props.channel.version;
   });
 
   const description = computed(() =>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
index b85b1bb877..e378705834 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
@@ -344,7 +344,7 @@
               try {
                 const response = await CommunityLibrarySubmission.fetchCollection({
                   channel: currentChannel.value.id,
-                  max_results: 1, 
+                  max_results: 1,
                 });
 
                 const submissions = response?.results || [];

From 6d943d1cf41d134a32d3246b7af09a64bedae08f Mon Sep 17 00:00:00 2001
From: "pre-commit-ci-lite[bot]"
 <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Date: Mon, 17 Nov 2025 17:51:42 +0000
Subject: [PATCH 06/10] [pre-commit.ci lite] apply automatic fixes

---
 .../modals/ResubmitChannelModal.vue           | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
index 8bd047b1cf..43b462918c 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
@@ -24,17 +24,17 @@
   import { communityChannelsStrings } from 'shared/strings/communityChannelsStrings';
 
   const props = defineProps({
-      value: {
-        type: Boolean,
-        default: false,
-      },
-      channel: {
-        type: Object,
-        required: true,
-        validator(value) {
-          return value && typeof value.name === 'string' && typeof value.version === 'number';
-        },
+    value: {
+      type: Boolean,
+      default: false,
+    },
+    channel: {
+      type: Object,
+      required: true,
+      validator(value) {
+        return value && typeof value.name === 'string' && typeof value.version === 'number';
       },
+    },
     latestSubmissionVersion: {
       type: Number,
       default: null,
@@ -46,7 +46,9 @@
   const title = computed(() => communityChannelsStrings.resubmitModalTitle$());
 
   const publishedVersion = computed(() => {
-    return props.latestSubmissionVersion != null ? props.latestSubmissionVersion : props.channel.version;
+    return props.latestSubmissionVersion != null
+      ? props.latestSubmissionVersion
+      : props.channel.version;
   });
 
   const description = computed(() =>

From 1b6fe9449420de20b2def5905c1e2d61b3e565df Mon Sep 17 00:00:00 2001
From: taoerman <qiliu0523@gmail.com>
Date: Mon, 17 Nov 2025 09:58:34 -0800
Subject: [PATCH 07/10] fix code

---
 .../frontend/channelEdit/views/TreeView/TreeViewBase.vue         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
index 163c839bd7..bd48fff629 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
@@ -360,7 +360,6 @@
   import PublishSidePanel from '../../components/sidePanels/PublishSidePanel';
   import SubmitToCommunityLibrarySidePanel from '../../components/sidePanels/SubmitToCommunityLibrarySidePanel';
   import ResubmitChannelModal from '../../components/modals/ResubmitChannelModal';
-  import { Channel } from 'shared/data/resources';
   import MainNavigationDrawer from 'shared/views/MainNavigationDrawer';
   import ToolBar from 'shared/views/ToolBar';
   import ChannelTokenModal from 'shared/views/channel/ChannelTokenModal';

From bd77b0c6e7ebf0d13be9a0bfaa1c212db139fb19 Mon Sep 17 00:00:00 2001
From: taoerman <qiliu0523@gmail.com>
Date: Wed, 19 Nov 2025 18:49:46 -0800
Subject: [PATCH 08/10] fix bug

---
 .../modals/ResubmitChannelModal.vue           | 18 +++----
 .../sidePanels/PublishSidePanel.vue           | 47 ++++++-------------
 .../views/TreeView/TreeViewBase.vue           | 28 +++++------
 .../strings/communityChannelsStrings.js       | 12 ++---
 4 files changed, 39 insertions(+), 66 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
index 43b462918c..28b74958d7 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
@@ -1,7 +1,6 @@
 <template>
 
   <KModal
-    v-if="value"
     :title="title"
     :submitText="resubmitButtonText"
     :cancelText="dismissButtonText"
@@ -24,10 +23,6 @@
   import { communityChannelsStrings } from 'shared/strings/communityChannelsStrings';
 
   const props = defineProps({
-    value: {
-      type: Boolean,
-      default: false,
-    },
     channel: {
       type: Object,
       required: true,
@@ -37,11 +32,11 @@
     },
     latestSubmissionVersion: {
       type: Number,
-      default: null,
+      required: true,
     },
   });
 
-  const emit = defineEmits(['dismiss', 'resubmit', 'input']);
+  const emit = defineEmits(['close', 'resubmit']);
 
   const title = computed(() => communityChannelsStrings.resubmitModalTitle$());
 
@@ -60,18 +55,17 @@
 
   const question = computed(() => communityChannelsStrings.resubmitModalBodySecond$());
 
-  const dismissButtonText = computed(() => communityChannelsStrings.dismissButton$());
+  const dismissButtonText = computed(() => communityChannelsStrings.dismissAction$());
 
-  const resubmitButtonText = computed(() => communityChannelsStrings.resubmitButton$());
+  const resubmitButtonText = computed(() => communityChannelsStrings.resubmitAction$());
 
   function handleDismiss() {
-    emit('dismiss');
-    emit('input', false);
+    emit('close');
   }
 
   function handleResubmit() {
     emit('resubmit');
-    emit('input', false);
+    emit('close');
   }
 
 </script>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
index e378705834..9a026dd6b3 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
@@ -137,16 +137,10 @@
           </KButton>
           <KButton
             primary
-            :disabled="submitting || checkingResubmit || !isFormValid"
+            :disabled="submitting || !isFormValid"
             @click="submit"
           >
-            <span
-              v-if="checkingResubmit"
-              class="loader-wrapper"
-            >
-              <KCircularLoader :size="16" />
-            </span>
-            <span v-else>{{ submitText }}</span>
+            {{ submitText }}
           </KButton>
         </div>
       </template>
@@ -179,7 +173,6 @@
       const mode = ref(PublishModes.LIVE);
       const version_notes = ref('');
       const submitting = ref(false);
-      const checkingResubmit = ref(false);
       const language = ref({});
       const showLanguageInvalidText = ref(false);
       const showVersionNotesInvalidText = ref(false); // lazy validation
@@ -340,36 +333,27 @@
             emit('published', { channelId: currentChannel.value.id });
 
             if (mode.value === PublishModes.LIVE) {
-              checkingResubmit.value = true;
-              try {
-                const response = await CommunityLibrarySubmission.fetchCollection({
-                  channel: currentChannel.value.id,
-                  max_results: 1,
-                });
+              const response = await CommunityLibrarySubmission.fetchCollection({
+                channel: currentChannel.value.id,
+                max_results: 1,
+              });
 
-                const submissions = response?.results || [];
-
-                if (submissions.length > 0) {
-                  const latestSubmission = submissions[0];
-                  emit('showResubmitCommunityLibraryModal', {
-                    channel: currentChannel.value ? { ...currentChannel.value } : null,
-                    latestSubmissionVersion: latestSubmission?.channel_version ?? null,
-                  });
-                }
-              } catch (error) {
-                store.dispatch('shared/handleAxiosError', error);
-              } finally {
-                checkingResubmit.value = false;
-                submitting.value = false;
+              const submissions = response?.results || [];
+
+              if (submissions.length > 0) {
+                const latestSubmission = submissions[0];
+                emit('showResubmitCommunityLibraryModal', {
+                  channel: { ...currentChannel.value },
+                  latestSubmissionVersion: latestSubmission.channel_version,
+                });
               }
-            } else {
-              submitting.value = false;
             }
 
             emit('close');
           }
         } catch (error) {
           store.dispatch('shared/handleAxiosError', error);
+        } finally {
           submitting.value = false;
         }
       };
@@ -404,7 +388,6 @@
         mode,
         version_notes,
         submitting,
-        checkingResubmit,
         language,
         showLanguageInvalidText,
         showVersionNotesInvalidText,
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
index bd48fff629..3f844c51df 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
@@ -244,12 +244,11 @@
       @close="showSubmitToCommunityLibrarySidePanel = false"
     />
     <ResubmitChannelModal
-      v-if="resubmitModalChannel || currentChannel"
-      v-model="showResubmitModal"
-      :channel="resubmitModalChannel || currentChannel"
-      :latestSubmissionVersion="resubmitModalSubmissionVersion"
+      v-if="resubmitModalData"
+      :channel="resubmitModalData.channel"
+      :latestSubmissionVersion="resubmitModalData.latestSubmissionVersion"
       @resubmit="handleResubmit"
-      @dismiss="handleDismissResubmit"
+      @close="handleDismissResubmit"
     />
     <template v-if="isPublished">
       <ChannelTokenModal
@@ -404,14 +403,12 @@
         drawer: false,
         showPublishSidePanel: false,
         showSubmitToCommunityLibrarySidePanel: false,
-        showResubmitModal: false,
         showTokenModal: false,
         showSyncModal: false,
         showClipboard: false,
         showDeleteModal: false,
         syncing: false,
-        resubmitModalChannel: null,
-        resubmitModalSubmissionVersion: null,
+        resubmitModalData: null,
       };
     },
     computed: {
@@ -562,18 +559,17 @@
         this.trackClickEvent('Publish');
       },
       handleResubmit() {
-        this.showResubmitModal = false;
         this.showSubmitToCommunityLibrarySidePanel = true;
       },
       handleDismissResubmit() {
-        this.showResubmitModal = false;
-        this.resubmitModalChannel = null;
-        this.resubmitModalSubmissionVersion = null;
+        this.resubmitModalData = null;
       },
-      handleShowResubmitModal({ channel, latestSubmissionVersion }) {
-        this.resubmitModalChannel = channel;
-        this.resubmitModalSubmissionVersion = latestSubmissionVersion || null;
-        this.showResubmitModal = true;
+      handleShowResubmitModal(resubmitData) {
+        if (resubmitData?.latestSubmissionVersion == null) {
+          this.showPublishSidePanel = false;
+          return;
+        }
+        this.resubmitModalData = resubmitData;
       },
       trackClickEvent(eventLabel) {
         this.$analytics.trackClick('channel_editor_toolbar', eventLabel);
diff --git a/contentcuration/contentcuration/frontend/shared/strings/communityChannelsStrings.js b/contentcuration/contentcuration/frontend/shared/strings/communityChannelsStrings.js
index 51ea2e0ab6..0176f04eb2 100644
--- a/contentcuration/contentcuration/frontend/shared/strings/communityChannelsStrings.js
+++ b/contentcuration/contentcuration/frontend/shared/strings/communityChannelsStrings.js
@@ -224,12 +224,12 @@ export const communityChannelsStrings = createTranslator('CommunityChannelsStrin
     context:
       'Second sentence of the body text of the modal shown after publishing a channel that already has Community Library submissions',
   },
-  resubmitButton: {
-    message: 'RESUBMIT',
-    context: 'Button in the resubmit modal to open the submit to Community Library side panel',
+  resubmitAction: {
+    message: 'Resubmit',
+    context: 'Action in the resubmit modal to open the submit to Community Library side panel',
   },
-  dismissButton: {
-    message: 'DISMISS',
-    context: 'Button in the resubmit modal to dismiss the modal',
+  dismissAction: {
+    message: 'Dismiss',
+    context: 'Action in the resubmit modal to dismiss the modal',
   },
 });

From d9322379ca44abc38cce907faa504d0de9a06ded Mon Sep 17 00:00:00 2001
From: taoerman <qiliu0523@gmail.com>
Date: Thu, 20 Nov 2025 09:01:05 -0800
Subject: [PATCH 09/10] fix code

---
 ...ue => ResubmitToCommunityLibraryModal.vue} |  0
 .../sidePanels/PublishSidePanel.vue           | 32 ++++++++++---------
 .../views/TreeView/TreeViewBase.vue           | 32 +++++++++----------
 3 files changed, 32 insertions(+), 32 deletions(-)
 rename contentcuration/contentcuration/frontend/channelEdit/components/modals/{ResubmitChannelModal.vue => ResubmitToCommunityLibraryModal.vue} (100%)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitToCommunityLibraryModal.vue
similarity index 100%
rename from contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitChannelModal.vue
rename to contentcuration/contentcuration/frontend/channelEdit/components/modals/ResubmitToCommunityLibraryModal.vue
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
index 9a026dd6b3..312244b555 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
@@ -330,22 +330,24 @@
 
             await Channel.publish(currentChannel.value.id, version_notes.value);
 
-            emit('published', { channelId: currentChannel.value.id });
-
             if (mode.value === PublishModes.LIVE) {
-              const response = await CommunityLibrarySubmission.fetchCollection({
-                channel: currentChannel.value.id,
-                max_results: 1,
-              });
-
-              const submissions = response?.results || [];
-
-              if (submissions.length > 0) {
-                const latestSubmission = submissions[0];
-                emit('showResubmitCommunityLibraryModal', {
-                  channel: { ...currentChannel.value },
-                  latestSubmissionVersion: latestSubmission.channel_version,
+              try {
+                const response = await CommunityLibrarySubmission.fetchCollection({
+                  channel: currentChannel.value.id,
+                  max_results: 1,
                 });
+
+                const submissions = response?.results || [];
+
+                if (submissions.length > 0) {
+                  const latestSubmission = submissions[0];
+                  emit('showResubmitCommunityLibraryModal', {
+                    channel: { ...currentChannel.value },
+                    latestSubmissionVersion: latestSubmission.channel_version,
+                  });
+                }
+              } catch (error) {
+                logging.error(error);
               }
             }
 
@@ -421,7 +423,7 @@
       };
     },
 
-    emits: ['close', 'published', 'showResubmitCommunityLibraryModal'],
+    emits: ['close', 'showResubmitCommunityLibraryModal'],
   };
 
 </script>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
index 3f844c51df..a0618e6ad1 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
@@ -235,20 +235,19 @@
     <PublishSidePanel
       v-if="showPublishSidePanel"
       @close="showPublishSidePanel = false"
-      @published="handleChannelPublished"
-      @showResubmitCommunityLibraryModal="handleShowResubmitModal"
+      @showResubmitCommunityLibraryModal="handleShowResubmitToCommunityLibraryModal"
     />
     <SubmitToCommunityLibrarySidePanel
       v-if="showSubmitToCommunityLibrarySidePanel"
       :channel="currentChannel"
       @close="showSubmitToCommunityLibrarySidePanel = false"
     />
-    <ResubmitChannelModal
-      v-if="resubmitModalData"
-      :channel="resubmitModalData.channel"
-      :latestSubmissionVersion="resubmitModalData.latestSubmissionVersion"
-      @resubmit="handleResubmit"
-      @close="handleDismissResubmit"
+    <ResubmitToCommunityLibraryModal
+      v-if="resubmitToCommunityLibraryModalData"
+      :channel="resubmitToCommunityLibraryModalData.channel"
+      :latestSubmissionVersion="resubmitToCommunityLibraryModalData.latestSubmissionVersion"
+      @resubmit="handleResubmitToCommunityLibrary"
+      @close="handleDismissResubmitToCommunityLibrary"
     />
     <template v-if="isPublished">
       <ChannelTokenModal
@@ -358,7 +357,7 @@
   import { DraggableRegions, DraggableUniverses, RouteNames } from '../../constants';
   import PublishSidePanel from '../../components/sidePanels/PublishSidePanel';
   import SubmitToCommunityLibrarySidePanel from '../../components/sidePanels/SubmitToCommunityLibrarySidePanel';
-  import ResubmitChannelModal from '../../components/modals/ResubmitChannelModal';
+  import ResubmitToCommunityLibraryModal from '../../components/modals/ResubmitToCommunityLibraryModal';
   import MainNavigationDrawer from 'shared/views/MainNavigationDrawer';
   import ToolBar from 'shared/views/ToolBar';
   import ChannelTokenModal from 'shared/views/channel/ChannelTokenModal';
@@ -379,7 +378,7 @@
       ToolBar,
       PublishSidePanel,
       SubmitToCommunityLibrarySidePanel,
-      ResubmitChannelModal,
+      ResubmitToCommunityLibraryModal,
       ProgressModal,
       ChannelTokenModal,
       SyncResourcesModal,
@@ -408,7 +407,7 @@
         showClipboard: false,
         showDeleteModal: false,
         syncing: false,
-        resubmitModalData: null,
+        resubmitToCommunityLibraryModalData: null,
       };
     },
     computed: {
@@ -558,18 +557,17 @@
         this.showPublishSidePanel = true;
         this.trackClickEvent('Publish');
       },
-      handleResubmit() {
+      handleResubmitToCommunityLibrary() {
         this.showSubmitToCommunityLibrarySidePanel = true;
       },
-      handleDismissResubmit() {
-        this.resubmitModalData = null;
+      handleDismissResubmitToCommunityLibrary() {
+        this.resubmitToCommunityLibraryModalData = null;
       },
-      handleShowResubmitModal(resubmitData) {
+      handleShowResubmitToCommunityLibraryModal(resubmitData) {
         if (resubmitData?.latestSubmissionVersion == null) {
-          this.showPublishSidePanel = false;
           return;
         }
-        this.resubmitModalData = resubmitData;
+        this.resubmitToCommunityLibraryModalData = resubmitData;
       },
       trackClickEvent(eventLabel) {
         this.$analytics.trackClick('channel_editor_toolbar', eventLabel);

From 3170f54cf20e3fd2cffc9ec623aaf8e7d0148a5d Mon Sep 17 00:00:00 2001
From: taoerman <qiliu0523@gmail.com>
Date: Thu, 20 Nov 2025 09:06:40 -0800
Subject: [PATCH 10/10] fix code

---
 .../channelEdit/components/sidePanels/PublishSidePanel.vue       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
index 312244b555..403cdebdac 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue
@@ -158,6 +158,7 @@
   import { forceServerSync } from 'shared/data/serverSync';
   import { communityChannelsStrings } from 'shared/strings/communityChannelsStrings';
   import { LanguagesList } from 'shared/leUtils/Languages';
+  import logging from 'shared/logging';
 
   export default {
     name: 'PublishSidePanel',