From 84de54b87b2d0644e3a5b5a2cb62cae46f270763 Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Wed, 1 Oct 2025 16:15:58 +0530
Subject: [PATCH 01/27] Replaced ConfirmationDialog to KModal and added 
 respectively and added classes to content and title for proper behaviour

---
 .../pages/Channels/ChannelActionsDropdown.vue | 139 ++++++++++--------
 1 file changed, 77 insertions(+), 62 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
index 2995871a9f..29cfa1fae9 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
@@ -1,56 +1,27 @@
 <template>
 
   <div>
-    <ConfirmationDialog
-      v-model="restoreDialog"
-      title="Restore channel"
-      :text="`Are you sure you want to restore ${name} and make it active again?`"
-      data-test="confirm-restore"
-      confirmButtonText="Restore"
-      @confirm="restoreHandler"
-    />
+    <KModal
+      v-if="activeDialog"
+      :title="dialogConfig.title"
+      :submitText="dialogConfig.submitText"
+      cancelText="Cancel"
+      data-test="confirm-dialog"
+      :errorMessage="dialogConfig.errorMessage"
+      :submitDisabled="dialogConfig.submitDisabled"
+      @submit="handleSubmit"
+      @cancel="activeDialog = null"
+    >
+      <p>{{ dialogConfig.message }}</p>
+    </KModal>
 
-    <ConfirmationDialog
-      v-model="makePublicDialog"
-      title="Make channel public"
-      :text="`All users will be able to view and import content from ${name}.`"
-      :error-text="communityChannelErrorMessage"
-      :disable-submit="isCommunityChannel"
-      data-test="confirm-public"
-      confirmButtonText="Make public"
-      @confirm="makePublicHandler"
-    />
-    <ConfirmationDialog
-      v-model="makePrivateDialog"
-      title="Make channel private"
-      :text="`Only users with view-only or edit permissions will be able to access ${name}.`"
-      data-test="confirm-private"
-      confirmButtonText="Make private"
-      @confirm="makePrivateHandler"
-    />
-    <ConfirmationDialog
-      v-model="deleteDialog"
-      title="Permanently delete channel"
-      :text="`Are you sure you want to permanently delete ${name}?  This can not be undone.`"
-      data-test="confirm-delete"
-      confirmButtonText="Delete permanently"
-      @confirm="deleteHandler"
-    />
-    <ConfirmationDialog
-      v-model="softDeleteDialog"
-      title="Permanently delete channel"
-      :text="`Are you sure you want to delete ${name}?`"
-      data-test="confirm-softdelete"
-      confirmButtonText="Delete"
-      @confirm="softDeleteHandler"
-    />
     <BaseMenu>
       <template #activator="{ on }">
         <VBtn
           v-bind="$attrs"
           v-on="on"
         >
-          actions
+          Actions
           <Icon
             icon="dropdown"
             class="ml-1"
@@ -61,13 +32,13 @@
         <template v-if="channel.deleted">
           <VListTile
             data-test="restore"
-            @click="restoreDialog = true"
+            @click="openDialog('restore')"
           >
             <VListTileTitle>Restore</VListTileTitle>
           </VListTile>
           <VListTile
             data-test="delete"
-            @click="deleteDialog = true"
+            @click="openDialog('permanentDelete')"
           >
             <VListTileTitle>Delete permanently</VListTileTitle>
           </VListTile>
@@ -94,21 +65,21 @@
           <VListTile
             v-if="channel.public"
             data-test="private"
-            @click="makePrivateDialog = true"
+            @click="openDialog('makePrivate')"
           >
             <VListTileTitle>Make private</VListTileTitle>
           </VListTile>
           <VListTile
             v-else
             data-test="public"
-            @click="makePublicDialog = true"
+            @click="openDialog('makePublic')"
           >
             <VListTileTitle>Make public</VListTileTitle>
           </VListTile>
           <VListTile
             v-if="!channel.public"
             data-test="softdelete"
-            @click="softDeleteDialog = true"
+            @click="openDialog('softDelete')"
           >
             <VListTileTitle>Delete channel</VListTileTitle>
           </VListTile>
@@ -123,16 +94,12 @@
 <script>
 
   import { mapActions, mapGetters } from 'vuex';
-  import ConfirmationDialog from '../../components/ConfirmationDialog';
   import { RouteNames } from '../../constants';
   import { channelExportMixin } from 'shared/views/channel/mixins';
   import { CommunityLibraryStatus } from 'shared/constants';
 
   export default {
     name: 'ChannelActionsDropdown',
-    components: {
-      ConfirmationDialog,
-    },
     mixins: [channelExportMixin],
     props: {
       channelId: {
@@ -141,11 +108,7 @@
       },
     },
     data: () => ({
-      deleteDialog: false,
-      makePublicDialog: false,
-      makePrivateDialog: false,
-      restoreDialog: false,
-      softDeleteDialog: false,
+      activeDialog: null,
     }),
     computed: {
       ...mapGetters('channel', ['getChannel']),
@@ -163,6 +126,53 @@
           },
         };
       },
+      dialogConfig() {
+        const configs = {
+          restore: {
+            title: 'Restore channel',
+            submitText: 'Restore',
+            message: `Are you sure you want to restore ${this.name} and make it active again?`,
+            handler: this.restoreHandler,
+            errorMessage: '',
+            submitDisabled: false,
+          },
+          makePublic: {
+            title: 'Make channel public',
+            submitText: 'Make public',
+            message: `All users will be able to view and import content from ${this.name}.`,
+
+            handler: this.makePublicHandler,
+            errorMessage: this.communityChannelErrorMessage,
+            submitDisabled: this.isCommunityChannel,
+          },
+          makePrivate: {
+            title: 'Make channel private',
+            submitText: 'Make private',
+            message: `Only users with view-only or edit permissions will be able to access ${this.name}.`,
+
+            handler: this.makePrivateHandler,
+            errorMessage: '',
+            submitDisabled: false,
+          },
+          permanentDelete: {
+            title: 'Permanently delete channel',
+            submitText: 'Delete permanently',
+            message: `Are you sure you want to permanently delete ${this.name}? This can not be undone.`,
+            handler: this.deleteHandler,
+            errorMessage: '',
+            submitDisabled: false,
+          },
+          softDelete: {
+            title: 'Delete channel',
+            submitText: 'Delete',
+            message: `Are you sure you want to delete ${this.name}?`,
+            handler: this.softDeleteHandler,
+            errorMessage: '',
+            submitDisabled: false,
+          },
+        };
+        return configs[this.activeDialog] || {};
+      },
       isCommunityChannel() {
         const status = this.channel.latest_community_library_submission_status;
         return status === CommunityLibraryStatus.APPROVED || status === CommunityLibraryStatus.LIVE;
@@ -180,6 +190,15 @@
         'deleteChannel',
         'updateChannel',
       ]),
+      openDialog(type) {
+        this.activeDialog = type;
+      },
+      handleSubmit() {
+        if (this.dialogConfig.handler) {
+          this.dialogConfig.handler();
+        }
+        this.activeDialog = null;
+      },
       async downloadPDF() {
         this.$store.dispatch('showSnackbarSimple', 'Generating PDF...');
         const channelList = await this.getAdminChannelListDetails([this.channel.id]);
@@ -191,7 +210,6 @@
         return this.generateChannelsCSV(channelList);
       },
       restoreHandler() {
-        this.restoreDialog = false;
         this.updateChannel({
           id: this.channelId,
           deleted: false,
@@ -200,7 +218,6 @@
         });
       },
       softDeleteHandler() {
-        this.softDeleteDialog = false;
         this.updateChannel({
           id: this.channelId,
           deleted: true,
@@ -209,14 +226,12 @@
         });
       },
       deleteHandler() {
-        this.deleteDialog = false;
         this.$emit('deleted');
         return this.deleteChannel(this.channelId).then(() => {
           this.$store.dispatch('showSnackbarSimple', 'Channel deleted permanently');
         });
       },
       makePublicHandler() {
-        this.makePublicDialog = false;
         this.updateChannel({
           id: this.channelId,
           isPublic: true,
@@ -225,7 +240,6 @@
         });
       },
       makePrivateHandler() {
-        this.makePrivateDialog = false;
         this.updateChannel({
           id: this.channelId,
           isPublic: false,
@@ -240,3 +254,4 @@
 
 
 <style lang="scss" scoped></style>
+

From ab4e683064a0ca8272c57ae8f403ffecaa03a9a1 Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Wed, 1 Oct 2025 17:55:23 +0530
Subject: [PATCH 02/27] Updated unit test for channelActionsDropdown

---
 .../Channels/__tests__/channelActionsDropdown.spec.js  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index 01113d2371..da1605a43c 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -74,7 +74,7 @@ describe('channelActionsDropdown', () => {
     });
 
     it('confirm restore channel should call updateChannel with deleted = false', () => {
-      wrapper.findComponent('[data-test="confirm-restore"]').vm.$emit('confirm');
+      wrapper.findComponent('[data-test="confirm-restore"]').vm.$emit('submit');
       expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, deleted: false });
     });
 
@@ -84,7 +84,7 @@ describe('channelActionsDropdown', () => {
     });
 
     it('confirm delete channel should call deleteChannel', () => {
-      wrapper.findComponent('[data-test="confirm-delete"]').vm.$emit('confirm');
+      wrapper.findComponent('[data-test="confirm-delete"]').vm.$emit('submit');
       expect(mocks.deleteChannel).toHaveBeenCalledWith(channelId);
     });
   });
@@ -110,7 +110,7 @@ describe('channelActionsDropdown', () => {
     });
 
     it('confirm make public should call updateChannel with isPublic = true', () => {
-      wrapper.findComponent('[data-test="confirm-public"]').vm.$emit('confirm');
+      wrapper.findComponent('[data-test="confirm-public"]').vm.$emit('submit');
       expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, isPublic: true });
     });
 
@@ -120,7 +120,7 @@ describe('channelActionsDropdown', () => {
     });
 
     it('confirm soft delete button should call updateChannel with deleted = true', () => {
-      wrapper.findComponent('[data-test="confirm-softdelete"]').vm.$emit('confirm');
+      wrapper.findComponent('[data-test="confirm-softdelete"]').vm.$emit('submit');
       expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, deleted: true });
     });
   });
@@ -136,7 +136,7 @@ describe('channelActionsDropdown', () => {
     });
 
     it('confirm make private should call updateChannel with isPublic = false', () => {
-      wrapper.findComponent('[data-test="confirm-private"]').vm.$emit('confirm');
+      wrapper.findComponent('[data-test="confirm-private"]').vm.$emit('submit');
       expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, isPublic: false });
     });
   });

From 809ee727cbae3219782f30fe8fe5b18d37096dc3 Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Wed, 1 Oct 2025 18:19:08 +0530
Subject: [PATCH 03/27] Updated channelActionsDropdown.spec.js for KModal
 considerations

---
 .../__tests__/channelActionsDropdown.spec.js    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index da1605a43c..7a4811d1a6 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -73,7 +73,8 @@ describe('channelActionsDropdown', () => {
       expect(wrapper.vm.restoreDialog).toBe(true);
     });
 
-    it('confirm restore channel should call updateChannel with deleted = false', () => {
+    it('confirm restore channel should call updateChannel with deleted = false', async () => {
+      await wrapper.findComponent('[data-test="restore"]').trigger('click');
       wrapper.findComponent('[data-test="confirm-restore"]').vm.$emit('submit');
       expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, deleted: false });
     });
@@ -83,7 +84,8 @@ describe('channelActionsDropdown', () => {
       expect(wrapper.vm.deleteDialog).toBe(true);
     });
 
-    it('confirm delete channel should call deleteChannel', () => {
+    it('confirm delete channel should call deleteChannel', async () => {
+      await wrapper.findComponent('[data-test="delete"]').trigger('click');
       wrapper.findComponent('[data-test="confirm-delete"]').vm.$emit('submit');
       expect(mocks.deleteChannel).toHaveBeenCalledWith(channelId);
     });
@@ -109,7 +111,8 @@ describe('channelActionsDropdown', () => {
       expect(wrapper.vm.makePublicDialog).toBe(true);
     });
 
-    it('confirm make public should call updateChannel with isPublic = true', () => {
+    it('confirm make public should call updateChannel with isPublic = true', async () => {
+      await wrapper.findComponent('[data-test="public"]').trigger('click');
       wrapper.findComponent('[data-test="confirm-public"]').vm.$emit('submit');
       expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, isPublic: true });
     });
@@ -119,7 +122,8 @@ describe('channelActionsDropdown', () => {
       expect(wrapper.vm.softDeleteDialog).toBe(true);
     });
 
-    it('confirm soft delete button should call updateChannel with deleted = true', () => {
+    it('confirm soft delete button should call updateChannel with deleted = true', async () => {
+      await wrapper.findComponent('[data-test="softdelete"]').trigger('click');
       wrapper.findComponent('[data-test="confirm-softdelete"]').vm.$emit('submit');
       expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, deleted: true });
     });
@@ -135,9 +139,10 @@ describe('channelActionsDropdown', () => {
       expect(wrapper.vm.makePrivateDialog).toBe(true);
     });
 
-    it('confirm make private should call updateChannel with isPublic = false', () => {
+    it('confirm make private should call updateChannel with isPublic = false', async () => {
+      await wrapper.findComponent('[data-test="private"]').trigger('click');
       wrapper.findComponent('[data-test="confirm-private"]').vm.$emit('submit');
       expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, isPublic: false });
     });
   });
-});
+});
\ No newline at end of file

From b9fedd3de1f9b305acfafe53920afa6f49830f90 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci-lite[bot]"
 <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Date: Wed, 1 Oct 2025 15:41:34 +0000
Subject: [PATCH 04/27] [pre-commit.ci lite] apply automatic fixes

---
 .../pages/Channels/__tests__/channelActionsDropdown.spec.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index 7a4811d1a6..dccc64f9a0 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -145,4 +145,4 @@ describe('channelActionsDropdown', () => {
       expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, isPublic: false });
     });
   });
-});
\ No newline at end of file
+});

From ebda23868892e7d43d0933b217a318500f1e4dfe Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Sun, 12 Oct 2025 10:28:53 +0530
Subject: [PATCH 05/27] Updated test for channel Action dropdown

---
 .../__tests__/channelActionsDropdown.spec.js  | 122 ++++++++++++------
 1 file changed, 85 insertions(+), 37 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index dccc64f9a0..a778f403ad 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -30,11 +30,20 @@ function makeWrapper(channelProps = {}) {
   };
   mocks.downloadPDF = jest.spyOn(ChannelActionsDropdown.methods, 'downloadPDF').mockResolvedValue();
   mocks.downloadCSV = jest.spyOn(ChannelActionsDropdown.methods, 'downloadCSV').mockResolvedValue();
-  mocks.deleteChannel = jest
-    .spyOn(ChannelActionsDropdown.methods, 'deleteChannel')
+  mocks.restoreHandler = jest
+    .spyOn(ChannelActionsDropdown.methods, 'restoreHandler')
     .mockResolvedValue();
-  mocks.updateChannel = jest
-    .spyOn(ChannelActionsDropdown.methods, 'updateChannel')
+  mocks.softDeleteHandler = jest
+    .spyOn(ChannelActionsDropdown.methods, 'softDeleteHandler')
+    .mockResolvedValue();
+  mocks.makePublicHandler = jest
+    .spyOn(ChannelActionsDropdown.methods, 'makePublicHandler')
+    .mockResolvedValue();
+  mocks.makePrivateHandler = jest
+    .spyOn(ChannelActionsDropdown.methods, 'makePrivateHandler')
+    .mockResolvedValue();
+  mocks.deleteHandler = jest
+    .spyOn(ChannelActionsDropdown.methods, 'deleteHandler')
     .mockResolvedValue();
 
   const wrapper = mount(ChannelActionsDropdown, {
@@ -69,25 +78,25 @@ describe('channelActionsDropdown', () => {
     });
 
     it('restore channel should open restore confirmation', async () => {
-      await wrapper.findComponent('[data-test="restore"]').trigger('click');
-      expect(wrapper.vm.restoreDialog).toBe(true);
+      await wrapper.find('[data-test="restore"]').trigger('click');
+      expect(wrapper.vm.activeDialog).toBe('restore');
     });
 
-    it('confirm restore channel should call updateChannel with deleted = false', async () => {
-      await wrapper.findComponent('[data-test="restore"]').trigger('click');
-      wrapper.findComponent('[data-test="confirm-restore"]').vm.$emit('submit');
-      expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, deleted: false });
+    it('confirm restore channel should call restoreHandler', async () => {
+      await wrapper.find('[data-test="restore"]').trigger('click');
+      wrapper.find('[data-test="confirm-restore"]').vm.$emit('submit');
+      expect(mocks.restoreHandler).toHaveBeenCalled();
     });
 
     it('delete channel should open delete confirmation', async () => {
-      await wrapper.findComponent('[data-test="delete"]').trigger('click');
-      expect(wrapper.vm.deleteDialog).toBe(true);
+      await wrapper.find('[data-test="delete"]').trigger('click');
+      expect(wrapper.vm.activeDialog).toBe('permanentDelete');
     });
 
-    it('confirm delete channel should call deleteChannel', async () => {
-      await wrapper.findComponent('[data-test="delete"]').trigger('click');
-      wrapper.findComponent('[data-test="confirm-delete"]').vm.$emit('submit');
-      expect(mocks.deleteChannel).toHaveBeenCalledWith(channelId);
+    it('confirm delete channel should call deleteHandler', async () => {
+      await wrapper.find('[data-test="delete"]').trigger('click');
+      wrapper.find('[data-test="confirm-delete"]').vm.$emit('submit');
+      expect(mocks.deleteHandler).toHaveBeenCalled();
     });
   });
 
@@ -97,52 +106,91 @@ describe('channelActionsDropdown', () => {
     });
 
     it('download PDF button should call downloadPDF', async () => {
-      await wrapper.findComponent('[data-test="pdf"]').trigger('click');
+      await wrapper.find('[data-test="pdf"]').trigger('click');
       expect(mocks.downloadPDF).toHaveBeenCalled();
     });
 
     it('download CSV button should call downloadCSV', async () => {
-      await wrapper.findComponent('[data-test="csv"]').trigger('click');
+      await wrapper.find('[data-test="csv"]').trigger('click');
       expect(mocks.downloadCSV).toHaveBeenCalled();
     });
 
     it('make public button should open make public confirmation', async () => {
-      await wrapper.findComponent('[data-test="public"]').trigger('click');
-      expect(wrapper.vm.makePublicDialog).toBe(true);
+      await wrapper.find('[data-test="public"]').trigger('click');
+      expect(wrapper.vm.activeDialog).toBe('makePublic');
     });
 
-    it('confirm make public should call updateChannel with isPublic = true', async () => {
-      await wrapper.findComponent('[data-test="public"]').trigger('click');
-      wrapper.findComponent('[data-test="confirm-public"]').vm.$emit('submit');
-      expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, isPublic: true });
+    it('confirm make public should call makePublicHandler', async () => {
+      await wrapper.find('[data-test="public"]').trigger('click');
+      wrapper.find('[data-test="confirm-public"]').vm.$emit('submit');
+      expect(mocks.makePublicHandler).toHaveBeenCalled();
     });
 
     it('soft delete button should open soft delete confirmation', async () => {
-      await wrapper.findComponent('[data-test="softdelete"]').trigger('click');
-      expect(wrapper.vm.softDeleteDialog).toBe(true);
+      await wrapper.find('[data-test="softdelete"]').trigger('click');
+      expect(wrapper.vm.activeDialog).toBe('softDelete');
     });
 
-    it('confirm soft delete button should call updateChannel with deleted = true', async () => {
-      await wrapper.findComponent('[data-test="softdelete"]').trigger('click');
-      wrapper.findComponent('[data-test="confirm-softdelete"]').vm.$emit('submit');
-      expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, deleted: true });
+    it('confirm soft delete button should call softDeleteHandler', async () => {
+      await wrapper.find('[data-test="softdelete"]').trigger('click');
+      wrapper.find('[data-test="confirm-softdelete"]').vm.$emit('submit');
+      expect(mocks.softDeleteHandler).toHaveBeenCalled();
     });
   });
 
   describe('public channel actions', () => {
     beforeEach(() => {
-      [wrapper, mocks] = makeWrapper();
+      [wrapper, mocks] = makeWrapper({ public: true, deleted: false });
     });
 
     it('make private button should open make private confirmation', async () => {
-      await wrapper.findComponent('[data-test="private"]').trigger('click');
-      expect(wrapper.vm.makePrivateDialog).toBe(true);
+      await wrapper.find('[data-test="private"]').trigger('click');
+      expect(wrapper.vm.activeDialog).toBe('makePrivate');
+    });
+
+    it('confirm make private should call makePrivateHandler', async () => {
+      await wrapper.find('[data-test="private"]').trigger('click');
+      wrapper.find('[data-test="confirm-private"]').vm.$emit('submit');
+      expect(mocks.makePrivateHandler).toHaveBeenCalled();
+    });
+
+    it('should not show soft delete button for public channels', () => {
+      expect(wrapper.find('[data-test="softdelete"]').exists()).toBe(false);
+    });
+  });
+
+  describe('modal configuration', () => {
+    beforeEach(() => {
+      [wrapper, mocks] = makeWrapper({ public: false, deleted: false });
+    });
+
+    it('should set correct dialog config for makePublic', async () => {
+      await wrapper.find('[data-test="public"]').trigger('click');
+      expect(wrapper.vm.dialogConfig.title).toBe('Make channel public');
+      expect(wrapper.vm.dialogConfig.submitText).toBe('Make public');
+      expect(wrapper.vm.dialogConfig.testId).toBe('confirm-public');
+    });
+
+    it('should set correct dialog config for makePrivate', async () => {
+      [wrapper, mocks] = makeWrapper({ public: true, deleted: false });
+      await wrapper.find('[data-test="private"]').trigger('click');
+      expect(wrapper.vm.dialogConfig.title).toBe('Make channel private');
+      expect(wrapper.vm.dialogConfig.submitText).toBe('Make private');
+      expect(wrapper.vm.dialogConfig.testId).toBe('confirm-private');
+    });
+
+    it('should close dialog when cancel is emitted', async () => {
+      await wrapper.find('[data-test="public"]').trigger('click');
+      expect(wrapper.vm.activeDialog).toBe('makePublic');
+      wrapper.find('[data-test="confirm-public"]').vm.$emit('cancel');
+      expect(wrapper.vm.activeDialog).toBeNull();
     });
 
-    it('confirm make private should call updateChannel with isPublic = false', async () => {
-      await wrapper.findComponent('[data-test="private"]').trigger('click');
-      wrapper.findComponent('[data-test="confirm-private"]').vm.$emit('submit');
-      expect(mocks.updateChannel).toHaveBeenCalledWith({ id: channelId, isPublic: false });
+    it('should call handleSubmit when submit is emitted', async () => {
+      const handleSubmitSpy = jest.spyOn(wrapper.vm, 'handleSubmit');
+      await wrapper.find('[data-test="public"]').trigger('click');
+      wrapper.find('[data-test="confirm-public"]').vm.$emit('submit');
+      expect(handleSubmitSpy).toHaveBeenCalled();
     });
   });
 });

From a35a798d13509385c13fd7a3683efb51a7ad9d67 Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Wed, 1 Oct 2025 18:19:08 +0530
Subject: [PATCH 06/27] Updated channelActionsDropdown.spec.js for KModal
 considerations

---
 .../pages/Channels/__tests__/channelActionsDropdown.spec.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index a778f403ad..bb879edb49 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -193,4 +193,4 @@ describe('channelActionsDropdown', () => {
       expect(handleSubmitSpy).toHaveBeenCalled();
     });
   });
-});
+});
\ No newline at end of file

From dd81d82bdecfd42a96932f80a5cc9cb1e4b1ef87 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci-lite[bot]"
 <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Date: Wed, 1 Oct 2025 15:41:34 +0000
Subject: [PATCH 07/27] [pre-commit.ci lite] apply automatic fixes

---
 .../pages/Channels/__tests__/channelActionsDropdown.spec.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index bb879edb49..a778f403ad 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -193,4 +193,4 @@ describe('channelActionsDropdown', () => {
       expect(handleSubmitSpy).toHaveBeenCalled();
     });
   });
-});
\ No newline at end of file
+});

From 2994c3363fedc2ad71f1a81640508d257f7c39d4 Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Thu, 30 Oct 2025 09:22:04 +0530
Subject: [PATCH 08/27] Made required changes to channelAcitonsDropdown

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

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
index 29cfa1fae9..5d01cd9f91 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
@@ -253,5 +253,4 @@
 </script>
 
 
-<style lang="scss" scoped></style>
-
+<style lang="scss" scoped></style>
\ No newline at end of file

From fd166b0d69760d676ba2854b35d3a6a8f482438f Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Thu, 30 Oct 2025 15:54:25 +0530
Subject: [PATCH 09/27] Used VTL here and updated to focus on UI

---
 .../__tests__/channelActionsDropdown.spec.js  | 271 ++++++++++--------
 1 file changed, 153 insertions(+), 118 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index a778f403ad..ea33414f65 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -1,8 +1,22 @@
-import { mount } from '@vue/test-utils';
+import { render, screen, configure } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
 import router from '../../../router';
 import { factory } from '../../../store';
 import ChannelActionsDropdown from '../ChannelActionsDropdown';
 
+configure({
+  testIdAttribute: 'data-test',
+});
+
+jest.mock('shared/views/channel/mixins', () => ({
+  channelExportMixin: {
+    methods: {
+      generateChannelsPDF: jest.fn().mockResolvedValue(),
+      generateChannelsCSV: jest.fn().mockResolvedValue(),
+    },
+  },
+}));
+
 const store = factory();
 
 const channelId = '11111111111111111111111111111111';
@@ -17,180 +31,201 @@ const channel = {
   deleted: false,
   demo_server_url: 'demo.com',
   source_url: 'source.com',
+  includes: {
+    coach_content: false,
+    exercises: false,
+  },
+  languages: [],
+  accessible_languages: [],
+  tags: [],
+  authors: [],
 };
 
-function makeWrapper(channelProps = {}) {
-  const mocks = {
-    restore() {
-      for (const key of Object.keys(this)) {
-        if (key === 'restore') continue;
-        this[key].mockRestore();
-      }
-    },
+function renderComponent(channelProps = {}) {
+  const mergedChannel = {
+    ...channel,
+    ...channelProps,
   };
-  mocks.downloadPDF = jest.spyOn(ChannelActionsDropdown.methods, 'downloadPDF').mockResolvedValue();
-  mocks.downloadCSV = jest.spyOn(ChannelActionsDropdown.methods, 'downloadCSV').mockResolvedValue();
-  mocks.restoreHandler = jest
-    .spyOn(ChannelActionsDropdown.methods, 'restoreHandler')
-    .mockResolvedValue();
-  mocks.softDeleteHandler = jest
-    .spyOn(ChannelActionsDropdown.methods, 'softDeleteHandler')
-    .mockResolvedValue();
-  mocks.makePublicHandler = jest
-    .spyOn(ChannelActionsDropdown.methods, 'makePublicHandler')
-    .mockResolvedValue();
-  mocks.makePrivateHandler = jest
-    .spyOn(ChannelActionsDropdown.methods, 'makePrivateHandler')
-    .mockResolvedValue();
-  mocks.deleteHandler = jest
-    .spyOn(ChannelActionsDropdown.methods, 'deleteHandler')
-    .mockResolvedValue();
-
-  const wrapper = mount(ChannelActionsDropdown, {
+
+  const utils = render(ChannelActionsDropdown, {
     router,
     store,
     propsData: { channelId },
     computed: {
-      channel() {
-        return {
-          ...channel,
-          ...channelProps,
-        };
+      channel: () => mergedChannel,
+    },
+    mocks: {
+      $store: {
+        dispatch: jest.fn().mockResolvedValue(),
       },
+      $tr: jest.fn(key => key),
     },
   });
 
-  return [wrapper, mocks];
+  return { ...utils };
 }
 
 describe('channelActionsDropdown', () => {
-  let wrapper, mocks;
+  let user;
 
-  afterEach(() => {
-    if (mocks) {
-      mocks.restore();
-    }
+  beforeEach(() => {
+    user = userEvent.setup();
+    jest.clearAllMocks();
   });
 
   describe('deleted channel actions', () => {
     beforeEach(() => {
-      [wrapper, mocks] = makeWrapper({ deleted: true });
+      renderComponent({ deleted: true });
     });
 
-    it('restore channel should open restore confirmation', async () => {
-      await wrapper.find('[data-test="restore"]').trigger('click');
-      expect(wrapper.vm.activeDialog).toBe('restore');
+    it('restore channel should show restore confirmation dialog with correct context', async () => {
+      const restoreButton = screen.getByTestId('restore');
+      await user.click(restoreButton);
+
+      const confirmDialog = screen.getByTestId('confirm-dialog');
+      expect(confirmDialog).toBeVisible();
+      expect(screen.getByText('Restore channel')).toBeVisible();
+      expect(screen.getByText(/Are you sure you want to restore Channel Test/)).toBeVisible();
     });
 
-    it('confirm restore channel should call restoreHandler', async () => {
-      await wrapper.find('[data-test="restore"]').trigger('click');
-      wrapper.find('[data-test="confirm-restore"]').vm.$emit('submit');
-      expect(mocks.restoreHandler).toHaveBeenCalled();
+    it('confirm restore channel should close the dialog', async () => {
+      const restoreButton = screen.getByTestId('restore');
+      await user.click(restoreButton);
+      const confirmButton = screen.getByRole('button', { name: 'Restore' });
+      await user.click(confirmButton);
+      expect(screen.queryByTestId('confirm-dialog')).not.toBeInTheDocument();
     });
 
-    it('delete channel should open delete confirmation', async () => {
-      await wrapper.find('[data-test="delete"]').trigger('click');
-      expect(wrapper.vm.activeDialog).toBe('permanentDelete');
+    it('delete channel should show permanent delete confirmation dialog with correct context', async () => {
+      const deleteButton = screen.getByTestId('delete');
+      await user.click(deleteButton);
+
+      const confirmDialog = screen.getByTestId('confirm-dialog');
+      expect(confirmDialog).toBeVisible();
+      expect(screen.getByText('Permanently delete channel')).toBeVisible();
+      expect(
+        screen.getByText(/Are you sure you want to permanently delete Channel Test\?/),
+      ).toBeVisible();
     });
 
-    it('confirm delete channel should call deleteHandler', async () => {
-      await wrapper.find('[data-test="delete"]').trigger('click');
-      wrapper.find('[data-test="confirm-delete"]').vm.$emit('submit');
-      expect(mocks.deleteHandler).toHaveBeenCalled();
+    it('confirm delete channel should close the dialog', async () => {
+      const deleteButton = screen.getByTestId('delete');
+      await user.click(deleteButton);
+      const confirmButton = screen.getByRole('button', { name: 'Delete permanently' });
+      await user.click(confirmButton);
+      expect(screen.queryByTestId('confirm-dialog')).not.toBeInTheDocument();
     });
   });
 
   describe('live channel actions', () => {
     beforeEach(() => {
-      [wrapper, mocks] = makeWrapper({ public: false, deleted: false });
+      renderComponent({ public: false, deleted: false });
     });
 
-    it('download PDF button should call downloadPDF', async () => {
-      await wrapper.find('[data-test="pdf"]').trigger('click');
-      expect(mocks.downloadPDF).toHaveBeenCalled();
+    it('download PDF button should trigger PDF download', async () => {
+      const pdfButton = screen.getByTestId('pdf');
+      await user.click(pdfButton);
+      expect(pdfButton).toBeVisible();
     });
 
-    it('download CSV button should call downloadCSV', async () => {
-      await wrapper.find('[data-test="csv"]').trigger('click');
-      expect(mocks.downloadCSV).toHaveBeenCalled();
+    it('download CSV button should trigger CSV download', async () => {
+      const csvButton = screen.getByTestId('csv');
+      await user.click(csvButton);
+      expect(csvButton).toBeVisible();
     });
 
-    it('make public button should open make public confirmation', async () => {
-      await wrapper.find('[data-test="public"]').trigger('click');
-      expect(wrapper.vm.activeDialog).toBe('makePublic');
-    });
+    it('make public button should show make public confirmation dialog with correct context', async () => {
+      const makePublicButton = screen.getByTestId('public');
+      await user.click(makePublicButton);
 
-    it('confirm make public should call makePublicHandler', async () => {
-      await wrapper.find('[data-test="public"]').trigger('click');
-      wrapper.find('[data-test="confirm-public"]').vm.$emit('submit');
-      expect(mocks.makePublicHandler).toHaveBeenCalled();
+      const confirmDialog = screen.getByTestId('confirm-dialog');
+      expect(confirmDialog).toBeVisible();
+      expect(screen.getByText('Make channel public')).toBeVisible();
+      expect(
+        screen.getByText(/All users will be able to view and import content from Channel Test/),
+      ).toBeVisible();
     });
 
-    it('soft delete button should open soft delete confirmation', async () => {
-      await wrapper.find('[data-test="softdelete"]').trigger('click');
-      expect(wrapper.vm.activeDialog).toBe('softDelete');
+    it('confirm make public should close the dialog', async () => {
+      const makePublicButton = screen.getByTestId('public');
+      await user.click(makePublicButton);
+      const confirmButton = screen.getByRole('button', { name: 'Make public' });
+      await user.click(confirmButton);
+      expect(screen.queryByTestId('confirm-dialog')).not.toBeInTheDocument();
     });
 
-    it('confirm soft delete button should call softDeleteHandler', async () => {
-      await wrapper.find('[data-test="softdelete"]').trigger('click');
-      wrapper.find('[data-test="confirm-softdelete"]').vm.$emit('submit');
-      expect(mocks.softDeleteHandler).toHaveBeenCalled();
-    });
-  });
-
-  describe('public channel actions', () => {
-    beforeEach(() => {
-      [wrapper, mocks] = makeWrapper({ public: true, deleted: false });
-    });
+    it('soft delete button should show soft delete confirmation dialog with correct context', async () => {
+      const softDeleteButton = screen.getByTestId('softdelete');
+      await user.click(softDeleteButton);
 
-    it('make private button should open make private confirmation', async () => {
-      await wrapper.find('[data-test="private"]').trigger('click');
-      expect(wrapper.vm.activeDialog).toBe('makePrivate');
+      const confirmDialog = screen.getByTestId('confirm-dialog');
+      expect(confirmDialog).toBeVisible();
+      expect(screen.getByRole('heading', { name: 'Delete channel' })).toBeVisible();
+      expect(screen.getByText(/Are you sure you want to delete Channel Test\?/)).toBeVisible();
     });
 
-    it('confirm make private should call makePrivateHandler', async () => {
-      await wrapper.find('[data-test="private"]').trigger('click');
-      wrapper.find('[data-test="confirm-private"]').vm.$emit('submit');
-      expect(mocks.makePrivateHandler).toHaveBeenCalled();
-    });
-
-    it('should not show soft delete button for public channels', () => {
-      expect(wrapper.find('[data-test="softdelete"]').exists()).toBe(false);
+    it('confirm soft delete should close the dialog', async () => {
+      const softDeleteButton = screen.getByTestId('softdelete');
+      await user.click(softDeleteButton);
+      const confirmButton = screen.getByRole('button', { name: 'Delete' });
+      await user.click(confirmButton);
+      expect(screen.queryByTestId('confirm-dialog')).not.toBeInTheDocument();
     });
   });
 
-  describe('modal configuration', () => {
+  describe('public channel actions', () => {
     beforeEach(() => {
-      [wrapper, mocks] = makeWrapper({ public: false, deleted: false });
+      renderComponent();
     });
 
-    it('should set correct dialog config for makePublic', async () => {
-      await wrapper.find('[data-test="public"]').trigger('click');
-      expect(wrapper.vm.dialogConfig.title).toBe('Make channel public');
-      expect(wrapper.vm.dialogConfig.submitText).toBe('Make public');
-      expect(wrapper.vm.dialogConfig.testId).toBe('confirm-public');
-    });
+    it('make private button should show make private confirmation dialog with correct context', async () => {
+      const makePrivateButton = screen.getByTestId('private');
+      await user.click(makePrivateButton);
 
-    it('should set correct dialog config for makePrivate', async () => {
-      [wrapper, mocks] = makeWrapper({ public: true, deleted: false });
-      await wrapper.find('[data-test="private"]').trigger('click');
-      expect(wrapper.vm.dialogConfig.title).toBe('Make channel private');
-      expect(wrapper.vm.dialogConfig.submitText).toBe('Make private');
-      expect(wrapper.vm.dialogConfig.testId).toBe('confirm-private');
+      const confirmDialog = screen.getByTestId('confirm-dialog');
+      expect(confirmDialog).toBeVisible();
+      expect(screen.getByText('Make channel private')).toBeVisible();
+      expect(
+        screen.getByText(
+          /Only users with view-only or edit permissions will be able to access Channel Test/,
+        ),
+      ).toBeVisible();
     });
 
-    it('should close dialog when cancel is emitted', async () => {
-      await wrapper.find('[data-test="public"]').trigger('click');
-      expect(wrapper.vm.activeDialog).toBe('makePublic');
-      wrapper.find('[data-test="confirm-public"]').vm.$emit('cancel');
-      expect(wrapper.vm.activeDialog).toBeNull();
+    it('confirm make private should close the dialog', async () => {
+      const makePrivateButton = screen.getByTestId('private');
+      await user.click(makePrivateButton);
+      const confirmButton = screen.getByRole('button', { name: 'Make private' });
+      await user.click(confirmButton);
+      expect(screen.queryByTestId('confirm-dialog')).not.toBeInTheDocument();
     });
+  });
 
-    it('should call handleSubmit when submit is emitted', async () => {
-      const handleSubmitSpy = jest.spyOn(wrapper.vm, 'handleSubmit');
-      await wrapper.find('[data-test="public"]').trigger('click');
-      wrapper.find('[data-test="confirm-public"]').vm.$emit('submit');
-      expect(handleSubmitSpy).toHaveBeenCalled();
+  describe('menu visibility', () => {
+    it('should show correct menu items for deleted channel', () => {
+      renderComponent({ deleted: true });
+      expect(screen.getByTestId('restore')).toBeVisible();
+      expect(screen.getByTestId('delete')).toBeVisible();
+      expect(screen.queryByTestId('pdf')).not.toBeInTheDocument();
+      expect(screen.queryByTestId('public')).not.toBeInTheDocument();
+    });
+
+    it('should show correct menu items for live private channel', () => {
+      renderComponent({ public: false, deleted: false });
+      expect(screen.getByTestId('pdf')).toBeVisible();
+      expect(screen.getByTestId('csv')).toBeVisible();
+      expect(screen.getByTestId('public')).toBeVisible();
+      expect(screen.getByTestId('softdelete')).toBeVisible();
+      expect(screen.queryByTestId('restore')).not.toBeInTheDocument();
+    });
+
+    it('should show correct menu items for live public channel', () => {
+      renderComponent({ public: true, deleted: false });
+      expect(screen.getByTestId('pdf')).toBeVisible();
+      expect(screen.getByTestId('csv')).toBeVisible();
+      expect(screen.getByTestId('private')).toBeVisible();
+      expect(screen.queryByTestId('softdelete')).not.toBeInTheDocument();
+      expect(screen.queryByTestId('restore')).not.toBeInTheDocument();
     });
   });
 });

From e7ec0e439f2326b52408163efac2cde8dc68ea6d Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Fri, 31 Oct 2025 10:33:47 +0530
Subject: [PATCH 10/27] added error handling

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

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
index 5d01cd9f91..66608f3bb0 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
@@ -7,6 +7,7 @@
       :submitText="dialogConfig.submitText"
       cancelText="Cancel"
       data-test="confirm-dialog"
+      :hasError="true"
       :errorMessage="dialogConfig.errorMessage"
       :submitDisabled="dialogConfig.submitDisabled"
       @submit="handleSubmit"
@@ -253,4 +254,4 @@
 </script>
 
 
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped></style>

From 13a13788a25840a87880d0c7b3f30f9f62a26d3a Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Fri, 31 Oct 2025 10:41:13 +0530
Subject: [PATCH 11/27] updated test file

---
 .../Channels/__tests__/channelActionsDropdown.spec.js     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index ea33414f65..88938ae7ba 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -31,14 +31,6 @@ const channel = {
   deleted: false,
   demo_server_url: 'demo.com',
   source_url: 'source.com',
-  includes: {
-    coach_content: false,
-    exercises: false,
-  },
-  languages: [],
-  accessible_languages: [],
-  tags: [],
-  authors: [],
 };
 
 function renderComponent(channelProps = {}) {

From 39747fdb48e75f83bc5ee8777c1f4979d9ff6d31 Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Fri, 31 Oct 2025 14:30:39 +0530
Subject: [PATCH 12/27] Updated to handle the public dialog error display

---
 .../pages/Channels/ChannelActionsDropdown.vue | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
index 66608f3bb0..d5de23fd1a 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
@@ -7,13 +7,18 @@
       :submitText="dialogConfig.submitText"
       cancelText="Cancel"
       data-test="confirm-dialog"
-      :hasError="true"
-      :errorMessage="dialogConfig.errorMessage"
       :submitDisabled="dialogConfig.submitDisabled"
       @submit="handleSubmit"
       @cancel="activeDialog = null"
     >
       <p>{{ dialogConfig.message }}</p>
+      <div
+        v-if="dialogConfig.errorMessage"
+        class="error-message"
+        :style="errorMessageStyles"
+      >
+        {{ dialogConfig.errorMessage }}
+      </div>
     </KModal>
 
     <BaseMenu>
@@ -134,14 +139,11 @@
             submitText: 'Restore',
             message: `Are you sure you want to restore ${this.name} and make it active again?`,
             handler: this.restoreHandler,
-            errorMessage: '',
-            submitDisabled: false,
           },
           makePublic: {
             title: 'Make channel public',
             submitText: 'Make public',
             message: `All users will be able to view and import content from ${this.name}.`,
-
             handler: this.makePublicHandler,
             errorMessage: this.communityChannelErrorMessage,
             submitDisabled: this.isCommunityChannel,
@@ -150,26 +152,19 @@
             title: 'Make channel private',
             submitText: 'Make private',
             message: `Only users with view-only or edit permissions will be able to access ${this.name}.`,
-
             handler: this.makePrivateHandler,
-            errorMessage: '',
-            submitDisabled: false,
           },
           permanentDelete: {
             title: 'Permanently delete channel',
             submitText: 'Delete permanently',
             message: `Are you sure you want to permanently delete ${this.name}? This can not be undone.`,
             handler: this.deleteHandler,
-            errorMessage: '',
-            submitDisabled: false,
           },
           softDelete: {
             title: 'Delete channel',
             submitText: 'Delete',
             message: `Are you sure you want to delete ${this.name}?`,
             handler: this.softDeleteHandler,
-            errorMessage: '',
-            submitDisabled: false,
           },
         };
         return configs[this.activeDialog] || {};
@@ -184,6 +179,14 @@
         }
         return '';
       },
+      errorMessageStyles() {
+        if (!this.dialogConfig.errorMessage) return {};
+
+        return {
+          color: this.$themeTokens.error,
+          backgroundColor: this.$themePalette.red.v_200,
+        };
+      },
     },
     methods: {
       ...mapActions('channelAdmin', [
@@ -254,4 +257,13 @@
 </script>
 
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+
+  .error-message {
+    padding: 8px 12px;
+    margin-top: 8px;
+    font-size: 14px;
+    border-radius: 4px;
+  }
+
+</style>

From 68039dd1c1d483cd8563c6a8618f169811675268 Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Fri, 31 Oct 2025 14:38:41 +0530
Subject: [PATCH 13/27] Updated to handle the public dialog error display

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

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
index d5de23fd1a..bf535265ac 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
@@ -184,7 +184,7 @@
 
         return {
           color: this.$themeTokens.error,
-          backgroundColor: this.$themePalette.red.v_200,
+          backgroundColor: this.$themePalette.red.v_100,
         };
       },
     },

From d0ec314676c833b946d97f816e9d0b188919f893 Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Fri, 31 Oct 2025 17:49:59 +0530
Subject: [PATCH 14/27] Removed configure from test case andused default

---
 .../__tests__/channelActionsDropdown.spec.js  | 78 +++++++++----------
 1 file changed, 37 insertions(+), 41 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index 88938ae7ba..bbfde79f4a 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -1,13 +1,9 @@
-import { render, screen, configure } from '@testing-library/vue';
+import { render, screen } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
 import router from '../../../router';
 import { factory } from '../../../store';
 import ChannelActionsDropdown from '../ChannelActionsDropdown';
 
-configure({
-  testIdAttribute: 'data-test',
-});
-
 jest.mock('shared/views/channel/mixins', () => ({
   channelExportMixin: {
     methods: {
@@ -71,28 +67,28 @@ describe('channelActionsDropdown', () => {
     });
 
     it('restore channel should show restore confirmation dialog with correct context', async () => {
-      const restoreButton = screen.getByTestId('restore');
+      const restoreButton = screen.getByText('Restore');
       await user.click(restoreButton);
 
-      const confirmDialog = screen.getByTestId('confirm-dialog');
+      const confirmDialog = screen.getByRole('dialog');
       expect(confirmDialog).toBeVisible();
       expect(screen.getByText('Restore channel')).toBeVisible();
       expect(screen.getByText(/Are you sure you want to restore Channel Test/)).toBeVisible();
     });
 
     it('confirm restore channel should close the dialog', async () => {
-      const restoreButton = screen.getByTestId('restore');
+      const restoreButton = screen.getByText('Restore');
       await user.click(restoreButton);
       const confirmButton = screen.getByRole('button', { name: 'Restore' });
       await user.click(confirmButton);
-      expect(screen.queryByTestId('confirm-dialog')).not.toBeInTheDocument();
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });
 
     it('delete channel should show permanent delete confirmation dialog with correct context', async () => {
-      const deleteButton = screen.getByTestId('delete');
+      const deleteButton = screen.getByText('Delete permanently');
       await user.click(deleteButton);
 
-      const confirmDialog = screen.getByTestId('confirm-dialog');
+      const confirmDialog = screen.getByRole('dialog');
       expect(confirmDialog).toBeVisible();
       expect(screen.getByText('Permanently delete channel')).toBeVisible();
       expect(
@@ -101,11 +97,11 @@ describe('channelActionsDropdown', () => {
     });
 
     it('confirm delete channel should close the dialog', async () => {
-      const deleteButton = screen.getByTestId('delete');
+      const deleteButton = screen.getByText('Delete permanently');
       await user.click(deleteButton);
       const confirmButton = screen.getByRole('button', { name: 'Delete permanently' });
       await user.click(confirmButton);
-      expect(screen.queryByTestId('confirm-dialog')).not.toBeInTheDocument();
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });
   });
 
@@ -115,22 +111,22 @@ describe('channelActionsDropdown', () => {
     });
 
     it('download PDF button should trigger PDF download', async () => {
-      const pdfButton = screen.getByTestId('pdf');
+      const pdfButton = screen.getByText('Download PDF');
       await user.click(pdfButton);
       expect(pdfButton).toBeVisible();
     });
 
     it('download CSV button should trigger CSV download', async () => {
-      const csvButton = screen.getByTestId('csv');
+      const csvButton = screen.getByText('Download CSV');
       await user.click(csvButton);
       expect(csvButton).toBeVisible();
     });
 
     it('make public button should show make public confirmation dialog with correct context', async () => {
-      const makePublicButton = screen.getByTestId('public');
+      const makePublicButton = screen.getByText('Make public');
       await user.click(makePublicButton);
 
-      const confirmDialog = screen.getByTestId('confirm-dialog');
+      const confirmDialog = screen.getByRole('dialog');
       expect(confirmDialog).toBeVisible();
       expect(screen.getByText('Make channel public')).toBeVisible();
       expect(
@@ -139,29 +135,29 @@ describe('channelActionsDropdown', () => {
     });
 
     it('confirm make public should close the dialog', async () => {
-      const makePublicButton = screen.getByTestId('public');
+      const makePublicButton = screen.getByText('Make public');
       await user.click(makePublicButton);
       const confirmButton = screen.getByRole('button', { name: 'Make public' });
       await user.click(confirmButton);
-      expect(screen.queryByTestId('confirm-dialog')).not.toBeInTheDocument();
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });
 
     it('soft delete button should show soft delete confirmation dialog with correct context', async () => {
-      const softDeleteButton = screen.getByTestId('softdelete');
+      const softDeleteButton = screen.getByText('Delete channel');
       await user.click(softDeleteButton);
 
-      const confirmDialog = screen.getByTestId('confirm-dialog');
+      const confirmDialog = screen.getByRole('dialog');
       expect(confirmDialog).toBeVisible();
       expect(screen.getByRole('heading', { name: 'Delete channel' })).toBeVisible();
       expect(screen.getByText(/Are you sure you want to delete Channel Test\?/)).toBeVisible();
     });
 
     it('confirm soft delete should close the dialog', async () => {
-      const softDeleteButton = screen.getByTestId('softdelete');
+      const softDeleteButton = screen.getByText('Delete channel');
       await user.click(softDeleteButton);
       const confirmButton = screen.getByRole('button', { name: 'Delete' });
       await user.click(confirmButton);
-      expect(screen.queryByTestId('confirm-dialog')).not.toBeInTheDocument();
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });
   });
 
@@ -171,10 +167,10 @@ describe('channelActionsDropdown', () => {
     });
 
     it('make private button should show make private confirmation dialog with correct context', async () => {
-      const makePrivateButton = screen.getByTestId('private');
+      const makePrivateButton = screen.getByText('Make private');
       await user.click(makePrivateButton);
 
-      const confirmDialog = screen.getByTestId('confirm-dialog');
+      const confirmDialog = screen.getByRole('dialog');
       expect(confirmDialog).toBeVisible();
       expect(screen.getByText('Make channel private')).toBeVisible();
       expect(
@@ -185,39 +181,39 @@ describe('channelActionsDropdown', () => {
     });
 
     it('confirm make private should close the dialog', async () => {
-      const makePrivateButton = screen.getByTestId('private');
+      const makePrivateButton = screen.getByText('Make private');
       await user.click(makePrivateButton);
       const confirmButton = screen.getByRole('button', { name: 'Make private' });
       await user.click(confirmButton);
-      expect(screen.queryByTestId('confirm-dialog')).not.toBeInTheDocument();
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });
   });
 
   describe('menu visibility', () => {
     it('should show correct menu items for deleted channel', () => {
       renderComponent({ deleted: true });
-      expect(screen.getByTestId('restore')).toBeVisible();
-      expect(screen.getByTestId('delete')).toBeVisible();
-      expect(screen.queryByTestId('pdf')).not.toBeInTheDocument();
-      expect(screen.queryByTestId('public')).not.toBeInTheDocument();
+      expect(screen.getByText('Restore')).toBeVisible();
+      expect(screen.getByText('Delete permanently')).toBeVisible();
+      expect(screen.queryByText('Download PDF')).not.toBeInTheDocument();
+      expect(screen.queryByText('Make public')).not.toBeInTheDocument();
     });
 
     it('should show correct menu items for live private channel', () => {
       renderComponent({ public: false, deleted: false });
-      expect(screen.getByTestId('pdf')).toBeVisible();
-      expect(screen.getByTestId('csv')).toBeVisible();
-      expect(screen.getByTestId('public')).toBeVisible();
-      expect(screen.getByTestId('softdelete')).toBeVisible();
-      expect(screen.queryByTestId('restore')).not.toBeInTheDocument();
+      expect(screen.getByText('Download PDF')).toBeVisible();
+      expect(screen.getByText('Download CSV')).toBeVisible();
+      expect(screen.getByText('Make public')).toBeVisible();
+      expect(screen.getByText('Delete channel')).toBeVisible();
+      expect(screen.queryByText('Restore')).not.toBeInTheDocument();
     });
 
     it('should show correct menu items for live public channel', () => {
       renderComponent({ public: true, deleted: false });
-      expect(screen.getByTestId('pdf')).toBeVisible();
-      expect(screen.getByTestId('csv')).toBeVisible();
-      expect(screen.getByTestId('private')).toBeVisible();
-      expect(screen.queryByTestId('softdelete')).not.toBeInTheDocument();
-      expect(screen.queryByTestId('restore')).not.toBeInTheDocument();
+      expect(screen.getByText('Download PDF')).toBeVisible();
+      expect(screen.getByText('Download CSV')).toBeVisible();
+      expect(screen.getByText('Make private')).toBeVisible();
+      expect(screen.queryByText('Delete channel')).not.toBeInTheDocument();
+      expect(screen.queryByText('Restore')).not.toBeInTheDocument();
     });
   });
 });

From 4c1dacd006fc1ac47192c1f90aa683eca7199563 Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Sat, 1 Nov 2025 11:14:55 +0530
Subject: [PATCH 15/27] updated test

---
 .../__tests__/channelActionsDropdown.spec.js  | 268 ++++++++++--------
 1 file changed, 142 insertions(+), 126 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index bbfde79f4a..f5a526da9d 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -1,19 +1,14 @@
 import { render, screen } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
-import router from '../../../router';
-import { factory } from '../../../store';
+import { createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
+import VueRouter from 'vue-router';
 import ChannelActionsDropdown from '../ChannelActionsDropdown';
+import { RouteNames } from '../../../constants';
 
-jest.mock('shared/views/channel/mixins', () => ({
-  channelExportMixin: {
-    methods: {
-      generateChannelsPDF: jest.fn().mockResolvedValue(),
-      generateChannelsCSV: jest.fn().mockResolvedValue(),
-    },
-  },
-}));
-
-const store = factory();
+const localVue = createLocalVue();
+localVue.use(Vuex);
+localVue.use(VueRouter);
 
 const channelId = '11111111111111111111111111111111';
 const channel = {
@@ -29,169 +24,190 @@ const channel = {
   source_url: 'source.com',
 };
 
-function renderComponent(channelProps = {}) {
-  const mergedChannel = {
-    ...channel,
-    ...channelProps,
-  };
+jest.mock('shared/views/channel/mixins', () => ({
+  channelExportMixin: {
+    methods: {
+      generateChannelsPDF: jest.fn().mockResolvedValue(),
+      generateChannelsCSV: jest.fn().mockResolvedValue(),
+    },
+  },
+}));
 
-  const utils = render(ChannelActionsDropdown, {
-    router,
-    store,
-    propsData: { channelId },
-    computed: {
-      channel: () => mergedChannel,
+const mockActions = {
+  updateChannel: jest.fn(() => Promise.resolve()),
+  deleteChannel: jest.fn(() => Promise.resolve()),
+  getAdminChannelListDetails: jest.fn(() => Promise.resolve([channel])),
+  showSnackbarSimple: jest.fn(() => Promise.resolve()),
+};
+
+const createMockStore = (channelProps = {}) => {
+  const mergedChannel = { ...channel, ...channelProps };
+
+  return new Vuex.Store({
+    modules: {
+      channel: {
+        namespaced: true,
+        state: {
+          channelsMap: { [channelId]: mergedChannel },
+        },
+        getters: {
+          getChannel: state => id => state.channelsMap[id],
+        },
+      },
+      channelAdmin: {
+        namespaced: true,
+        actions: {
+          updateChannel: mockActions.updateChannel,
+          deleteChannel: mockActions.deleteChannel,
+          getAdminChannelListDetails: mockActions.getAdminChannelListDetails,
+        },
+      },
     },
-    mocks: {
-      $store: {
-        dispatch: jest.fn().mockResolvedValue(),
+    actions: {
+      showSnackbarSimple: mockActions.showSnackbarSimple,
+    },
+  });
+};
+
+const renderComponent = (props = {}) => {
+  const store = createMockStore(props.channelProps);
+
+  const router = new VueRouter({
+    routes: [
+      {
+        name: RouteNames.USERS,
+        path: '/users',
+        component: { template: '<div>Users Page</div>' },
       },
+    ],
+  });
+
+  return render(ChannelActionsDropdown, {
+    localVue,
+    store,
+    router,
+    props: { channelId },
+    mocks: {
       $tr: jest.fn(key => key),
     },
   });
-
-  return { ...utils };
-}
+};
 
 describe('channelActionsDropdown', () => {
-  let user;
-
   beforeEach(() => {
-    user = userEvent.setup();
     jest.clearAllMocks();
   });
 
-  describe('deleted channel actions', () => {
-    beforeEach(() => {
-      renderComponent({ deleted: true });
-    });
+  describe('clicking restore menu option', () => {
+    it('should open confirmation modal and restore channel on confirm', async () => {
+      const dialogMessage = `Are you sure you want to restore Channel Test and make it active again?`;
+      const user = userEvent.setup();
 
-    it('restore channel should show restore confirmation dialog with correct context', async () => {
-      const restoreButton = screen.getByText('Restore');
-      await user.click(restoreButton);
+      renderComponent({ channelProps: { deleted: true } });
 
-      const confirmDialog = screen.getByRole('dialog');
-      expect(confirmDialog).toBeVisible();
-      expect(screen.getByText('Restore channel')).toBeVisible();
-      expect(screen.getByText(/Are you sure you want to restore Channel Test/)).toBeVisible();
-    });
+      expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
 
-    it('confirm restore channel should close the dialog', async () => {
-      const restoreButton = screen.getByText('Restore');
-      await user.click(restoreButton);
+      await user.click(screen.getByText('Restore'));
+
+      expect(screen.getByText(dialogMessage)).toBeInTheDocument();
       const confirmButton = screen.getByRole('button', { name: 'Restore' });
       await user.click(confirmButton);
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+
+      expect(mockActions.updateChannel).toHaveBeenCalledWith(expect.any(Object), {
+        id: channelId,
+        deleted: false,
+      });
     });
+  });
 
-    it('delete channel should show permanent delete confirmation dialog with correct context', async () => {
-      const deleteButton = screen.getByText('Delete permanently');
-      await user.click(deleteButton);
+  describe('clicking delete permanently menu option', () => {
+    it('should open confirmation modal and delete channel on confirm', async () => {
+      const dialogMessage = `Are you sure you want to permanently delete Channel Test? This can not be undone.`;
+      const user = userEvent.setup();
 
-      const confirmDialog = screen.getByRole('dialog');
-      expect(confirmDialog).toBeVisible();
-      expect(screen.getByText('Permanently delete channel')).toBeVisible();
-      expect(
-        screen.getByText(/Are you sure you want to permanently delete Channel Test\?/),
-      ).toBeVisible();
-    });
+      renderComponent({ channelProps: { deleted: true } });
 
-    it('confirm delete channel should close the dialog', async () => {
-      const deleteButton = screen.getByText('Delete permanently');
-      await user.click(deleteButton);
+      expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
+
+      await user.click(screen.getByText('Delete permanently'));
+
+      expect(screen.getByText(dialogMessage)).toBeInTheDocument();
       const confirmButton = screen.getByRole('button', { name: 'Delete permanently' });
       await user.click(confirmButton);
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-    });
-  });
 
-  describe('live channel actions', () => {
-    beforeEach(() => {
-      renderComponent({ public: false, deleted: false });
+      expect(mockActions.deleteChannel).toHaveBeenCalledWith(expect.any(Object), channelId);
     });
+  });
 
-    it('download PDF button should trigger PDF download', async () => {
-      const pdfButton = screen.getByText('Download PDF');
-      await user.click(pdfButton);
-      expect(pdfButton).toBeVisible();
-    });
+  describe('clicking make public menu option', () => {
+    it('should open confirmation modal and make channel public on confirm', async () => {
+      const dialogMessage = `All users will be able to view and import content from Channel Test.`;
+      const user = userEvent.setup();
 
-    it('download CSV button should trigger CSV download', async () => {
-      const csvButton = screen.getByText('Download CSV');
-      await user.click(csvButton);
-      expect(csvButton).toBeVisible();
-    });
+      renderComponent({ channelProps: { public: false, deleted: false } });
 
-    it('make public button should show make public confirmation dialog with correct context', async () => {
-      const makePublicButton = screen.getByText('Make public');
-      await user.click(makePublicButton);
+      expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
 
-      const confirmDialog = screen.getByRole('dialog');
-      expect(confirmDialog).toBeVisible();
-      expect(screen.getByText('Make channel public')).toBeVisible();
-      expect(
-        screen.getByText(/All users will be able to view and import content from Channel Test/),
-      ).toBeVisible();
-    });
+      await user.click(screen.getByText('Make public'));
 
-    it('confirm make public should close the dialog', async () => {
-      const makePublicButton = screen.getByText('Make public');
-      await user.click(makePublicButton);
+      expect(screen.getByText(dialogMessage)).toBeInTheDocument();
       const confirmButton = screen.getByRole('button', { name: 'Make public' });
       await user.click(confirmButton);
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+
+      expect(mockActions.updateChannel).toHaveBeenCalledWith(expect.any(Object), {
+        id: channelId,
+        isPublic: true,
+      });
     });
+  });
 
-    it('soft delete button should show soft delete confirmation dialog with correct context', async () => {
-      const softDeleteButton = screen.getByText('Delete channel');
-      await user.click(softDeleteButton);
+  describe('clicking delete channel menu option', () => {
+    it('should open confirmation modal and soft delete channel on confirm', async () => {
+      const dialogMessage = `Are you sure you want to delete Channel Test?`;
+      const user = userEvent.setup();
 
-      const confirmDialog = screen.getByRole('dialog');
-      expect(confirmDialog).toBeVisible();
-      expect(screen.getByRole('heading', { name: 'Delete channel' })).toBeVisible();
-      expect(screen.getByText(/Are you sure you want to delete Channel Test\?/)).toBeVisible();
-    });
+      renderComponent({ channelProps: { public: false, deleted: false } });
+
+      expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
 
-    it('confirm soft delete should close the dialog', async () => {
-      const softDeleteButton = screen.getByText('Delete channel');
-      await user.click(softDeleteButton);
+      await user.click(screen.getByText('Delete channel'));
+
+      expect(screen.getByText(dialogMessage)).toBeInTheDocument();
       const confirmButton = screen.getByRole('button', { name: 'Delete' });
       await user.click(confirmButton);
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+
+      expect(mockActions.updateChannel).toHaveBeenCalledWith(expect.any(Object), {
+        id: channelId,
+        deleted: true,
+      });
     });
   });
 
-  describe('public channel actions', () => {
-    beforeEach(() => {
+  describe('clicking make private menu option', () => {
+    it('should open confirmation modal and make channel private on confirm', async () => {
+      const dialogMessage = `Only users with view-only or edit permissions will be able to access Channel Test.`;
+      const user = userEvent.setup();
+
       renderComponent();
-    });
 
-    it('make private button should show make private confirmation dialog with correct context', async () => {
-      const makePrivateButton = screen.getByText('Make private');
-      await user.click(makePrivateButton);
-
-      const confirmDialog = screen.getByRole('dialog');
-      expect(confirmDialog).toBeVisible();
-      expect(screen.getByText('Make channel private')).toBeVisible();
-      expect(
-        screen.getByText(
-          /Only users with view-only or edit permissions will be able to access Channel Test/,
-        ),
-      ).toBeVisible();
-    });
+      expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
+
+      await user.click(screen.getByText('Make private'));
 
-    it('confirm make private should close the dialog', async () => {
-      const makePrivateButton = screen.getByText('Make private');
-      await user.click(makePrivateButton);
+      expect(screen.getByText(dialogMessage)).toBeInTheDocument();
       const confirmButton = screen.getByRole('button', { name: 'Make private' });
       await user.click(confirmButton);
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+
+      expect(mockActions.updateChannel).toHaveBeenCalledWith(expect.any(Object), {
+        id: channelId,
+        isPublic: false,
+      });
     });
   });
 
   describe('menu visibility', () => {
     it('should show correct menu items for deleted channel', () => {
-      renderComponent({ deleted: true });
+      renderComponent({ channelProps: { deleted: true } });
       expect(screen.getByText('Restore')).toBeVisible();
       expect(screen.getByText('Delete permanently')).toBeVisible();
       expect(screen.queryByText('Download PDF')).not.toBeInTheDocument();
@@ -199,7 +215,7 @@ describe('channelActionsDropdown', () => {
     });
 
     it('should show correct menu items for live private channel', () => {
-      renderComponent({ public: false, deleted: false });
+      renderComponent({ channelProps: { public: false, deleted: false } });
       expect(screen.getByText('Download PDF')).toBeVisible();
       expect(screen.getByText('Download CSV')).toBeVisible();
       expect(screen.getByText('Make public')).toBeVisible();
@@ -208,7 +224,7 @@ describe('channelActionsDropdown', () => {
     });
 
     it('should show correct menu items for live public channel', () => {
-      renderComponent({ public: true, deleted: false });
+      renderComponent({ channelProps: { public: true, deleted: false } });
       expect(screen.getByText('Download PDF')).toBeVisible();
       expect(screen.getByText('Download CSV')).toBeVisible();
       expect(screen.getByText('Make private')).toBeVisible();

From 5324333b41daabfd3383a89ed5634341e1df1391 Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Sat, 1 Nov 2025 11:49:28 +0530
Subject: [PATCH 16/27] added snackbar test

---
 .../__tests__/channelActionsDropdown.spec.js  | 107 +++++++++++++-----
 1 file changed, 81 insertions(+), 26 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index f5a526da9d..2a02ea14dd 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -4,11 +4,9 @@ import { createLocalVue } from '@vue/test-utils';
 import Vuex from 'vuex';
 import VueRouter from 'vue-router';
 import ChannelActionsDropdown from '../ChannelActionsDropdown';
-import { RouteNames } from '../../../constants';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);
-localVue.use(VueRouter);
 
 const channelId = '11111111111111111111111111111111';
 const channel = {
@@ -72,24 +70,11 @@ const createMockStore = (channelProps = {}) => {
 const renderComponent = (props = {}) => {
   const store = createMockStore(props.channelProps);
 
-  const router = new VueRouter({
-    routes: [
-      {
-        name: RouteNames.USERS,
-        path: '/users',
-        component: { template: '<div>Users Page</div>' },
-      },
-    ],
-  });
-
   return render(ChannelActionsDropdown, {
     localVue,
     store,
-    router,
     props: { channelId },
-    mocks: {
-      $tr: jest.fn(key => key),
-    },
+    routes: new VueRouter(),
   });
 };
 
@@ -98,8 +83,8 @@ describe('channelActionsDropdown', () => {
     jest.clearAllMocks();
   });
 
-  describe('clicking restore menu option', () => {
-    it('should open confirmation modal and restore channel on confirm', async () => {
+  describe('restore channel dialog', () => {
+    it('should open confirmation modal, call updateChannel action, and show snackbar when confirmed', async () => {
       const dialogMessage = `Are you sure you want to restore Channel Test and make it active again?`;
       const user = userEvent.setup();
 
@@ -110,6 +95,8 @@ describe('channelActionsDropdown', () => {
       await user.click(screen.getByText('Restore'));
 
       expect(screen.getByText(dialogMessage)).toBeInTheDocument();
+      expect(screen.getByText('Restore channel')).toBeVisible();
+
       const confirmButton = screen.getByRole('button', { name: 'Restore' });
       await user.click(confirmButton);
 
@@ -117,11 +104,23 @@ describe('channelActionsDropdown', () => {
         id: channelId,
         deleted: false,
       });
+      expect(mockActions.showSnackbarSimple.mock.calls[0][1]).toBe('Channel restored');
+    });
+
+    it('should close the dialog when confirm button is clicked', async () => {
+      const user = userEvent.setup();
+      renderComponent({ channelProps: { deleted: true } });
+
+      await user.click(screen.getByText('Restore'));
+      const confirmButton = screen.getByRole('button', { name: 'Restore' });
+      await user.click(confirmButton);
+
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });
   });
 
-  describe('clicking delete permanently menu option', () => {
-    it('should open confirmation modal and delete channel on confirm', async () => {
+  describe('delete permanently dialog', () => {
+    it('should open confirmation modal, call deleteChannel action, and show snackbar when confirmed', async () => {
       const dialogMessage = `Are you sure you want to permanently delete Channel Test? This can not be undone.`;
       const user = userEvent.setup();
 
@@ -132,15 +131,29 @@ describe('channelActionsDropdown', () => {
       await user.click(screen.getByText('Delete permanently'));
 
       expect(screen.getByText(dialogMessage)).toBeInTheDocument();
+      expect(screen.getByText('Permanently delete channel')).toBeVisible();
+
       const confirmButton = screen.getByRole('button', { name: 'Delete permanently' });
       await user.click(confirmButton);
 
       expect(mockActions.deleteChannel).toHaveBeenCalledWith(expect.any(Object), channelId);
+      expect(mockActions.showSnackbarSimple.mock.calls[0][1]).toBe('Channel deleted permanently');
+    });
+
+    it('should close the dialog when confirm button is clicked', async () => {
+      const user = userEvent.setup();
+      renderComponent({ channelProps: { deleted: true } });
+
+      await user.click(screen.getByText('Delete permanently'));
+      const confirmButton = screen.getByRole('button', { name: 'Delete permanently' });
+      await user.click(confirmButton);
+
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });
   });
 
-  describe('clicking make public menu option', () => {
-    it('should open confirmation modal and make channel public on confirm', async () => {
+  describe('make public dialog', () => {
+    it('should open confirmation modal, call updateChannel action, and show snackbar when confirmed', async () => {
       const dialogMessage = `All users will be able to view and import content from Channel Test.`;
       const user = userEvent.setup();
 
@@ -151,6 +164,8 @@ describe('channelActionsDropdown', () => {
       await user.click(screen.getByText('Make public'));
 
       expect(screen.getByText(dialogMessage)).toBeInTheDocument();
+      expect(screen.getByText('Make channel public')).toBeVisible();
+
       const confirmButton = screen.getByRole('button', { name: 'Make public' });
       await user.click(confirmButton);
 
@@ -158,11 +173,23 @@ describe('channelActionsDropdown', () => {
         id: channelId,
         isPublic: true,
       });
+      expect(mockActions.showSnackbarSimple.mock.calls[0][1]).toBe('Channel changed to public');
+    });
+
+    it('should close the dialog when confirm button is clicked', async () => {
+      const user = userEvent.setup();
+      renderComponent({ channelProps: { public: false, deleted: false } });
+
+      await user.click(screen.getByText('Make public'));
+      const confirmButton = screen.getByRole('button', { name: 'Make public' });
+      await user.click(confirmButton);
+
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });
   });
 
-  describe('clicking delete channel menu option', () => {
-    it('should open confirmation modal and soft delete channel on confirm', async () => {
+  describe('delete channel dialog', () => {
+    it('should open confirmation modal, call updateChannel action, and show snackbar when confirmed', async () => {
       const dialogMessage = `Are you sure you want to delete Channel Test?`;
       const user = userEvent.setup();
 
@@ -173,6 +200,8 @@ describe('channelActionsDropdown', () => {
       await user.click(screen.getByText('Delete channel'));
 
       expect(screen.getByText(dialogMessage)).toBeInTheDocument();
+      expect(screen.getByRole('heading', { name: 'Delete channel' })).toBeVisible();
+
       const confirmButton = screen.getByRole('button', { name: 'Delete' });
       await user.click(confirmButton);
 
@@ -180,11 +209,23 @@ describe('channelActionsDropdown', () => {
         id: channelId,
         deleted: true,
       });
+      expect(mockActions.showSnackbarSimple.mock.calls[0][1]).toBe('Channel deleted');
+    });
+
+    it('should close the dialog when confirm button is clicked', async () => {
+      const user = userEvent.setup();
+      renderComponent({ channelProps: { public: false, deleted: false } });
+
+      await user.click(screen.getByText('Delete channel'));
+      const confirmButton = screen.getByRole('button', { name: 'Delete' });
+      await user.click(confirmButton);
+
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });
   });
 
-  describe('clicking make private menu option', () => {
-    it('should open confirmation modal and make channel private on confirm', async () => {
+  describe('make private dialog', () => {
+    it('should open confirmation modal, call updateChannel action, and show snackbar when confirmed', async () => {
       const dialogMessage = `Only users with view-only or edit permissions will be able to access Channel Test.`;
       const user = userEvent.setup();
 
@@ -195,6 +236,8 @@ describe('channelActionsDropdown', () => {
       await user.click(screen.getByText('Make private'));
 
       expect(screen.getByText(dialogMessage)).toBeInTheDocument();
+      expect(screen.getByText('Make channel private')).toBeVisible();
+
       const confirmButton = screen.getByRole('button', { name: 'Make private' });
       await user.click(confirmButton);
 
@@ -202,6 +245,18 @@ describe('channelActionsDropdown', () => {
         id: channelId,
         isPublic: false,
       });
+      expect(mockActions.showSnackbarSimple.mock.calls[0][1]).toBe('Channel changed to private');
+    });
+
+    it('should close the dialog when confirm button is clicked', async () => {
+      const user = userEvent.setup();
+      renderComponent();
+
+      await user.click(screen.getByText('Make private'));
+      const confirmButton = screen.getByRole('button', { name: 'Make private' });
+      await user.click(confirmButton);
+
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });
   });
 

From b3d84f069f97a0c71ed8657069d45735d892f719 Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Sat, 1 Nov 2025 12:13:52 +0530
Subject: [PATCH 17/27] Updated

---
 .../__tests__/channelActionsDropdown.spec.js  | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index 2a02ea14dd..c51e4883b1 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -35,7 +35,6 @@ const mockActions = {
   updateChannel: jest.fn(() => Promise.resolve()),
   deleteChannel: jest.fn(() => Promise.resolve()),
   getAdminChannelListDetails: jest.fn(() => Promise.resolve([channel])),
-  showSnackbarSimple: jest.fn(() => Promise.resolve()),
 };
 
 const createMockStore = (channelProps = {}) => {
@@ -61,9 +60,6 @@ const createMockStore = (channelProps = {}) => {
         },
       },
     },
-    actions: {
-      showSnackbarSimple: mockActions.showSnackbarSimple,
-    },
   });
 };
 
@@ -84,7 +80,7 @@ describe('channelActionsDropdown', () => {
   });
 
   describe('restore channel dialog', () => {
-    it('should open confirmation modal, call updateChannel action, and show snackbar when confirmed', async () => {
+    it('should open confirmation modal and call updateChannel action when confirmed', async () => {
       const dialogMessage = `Are you sure you want to restore Channel Test and make it active again?`;
       const user = userEvent.setup();
 
@@ -104,7 +100,6 @@ describe('channelActionsDropdown', () => {
         id: channelId,
         deleted: false,
       });
-      expect(mockActions.showSnackbarSimple.mock.calls[0][1]).toBe('Channel restored');
     });
 
     it('should close the dialog when confirm button is clicked', async () => {
@@ -120,7 +115,7 @@ describe('channelActionsDropdown', () => {
   });
 
   describe('delete permanently dialog', () => {
-    it('should open confirmation modal, call deleteChannel action, and show snackbar when confirmed', async () => {
+    it('should open confirmation modal and call deleteChannel action when confirmed', async () => {
       const dialogMessage = `Are you sure you want to permanently delete Channel Test? This can not be undone.`;
       const user = userEvent.setup();
 
@@ -137,7 +132,6 @@ describe('channelActionsDropdown', () => {
       await user.click(confirmButton);
 
       expect(mockActions.deleteChannel).toHaveBeenCalledWith(expect.any(Object), channelId);
-      expect(mockActions.showSnackbarSimple.mock.calls[0][1]).toBe('Channel deleted permanently');
     });
 
     it('should close the dialog when confirm button is clicked', async () => {
@@ -153,7 +147,7 @@ describe('channelActionsDropdown', () => {
   });
 
   describe('make public dialog', () => {
-    it('should open confirmation modal, call updateChannel action, and show snackbar when confirmed', async () => {
+    it('should open confirmation modal and call updateChannel action when confirmed', async () => {
       const dialogMessage = `All users will be able to view and import content from Channel Test.`;
       const user = userEvent.setup();
 
@@ -173,7 +167,6 @@ describe('channelActionsDropdown', () => {
         id: channelId,
         isPublic: true,
       });
-      expect(mockActions.showSnackbarSimple.mock.calls[0][1]).toBe('Channel changed to public');
     });
 
     it('should close the dialog when confirm button is clicked', async () => {
@@ -189,7 +182,7 @@ describe('channelActionsDropdown', () => {
   });
 
   describe('delete channel dialog', () => {
-    it('should open confirmation modal, call updateChannel action, and show snackbar when confirmed', async () => {
+    it('should open confirmation modal and call updateChannel action when confirmed', async () => {
       const dialogMessage = `Are you sure you want to delete Channel Test?`;
       const user = userEvent.setup();
 
@@ -209,7 +202,6 @@ describe('channelActionsDropdown', () => {
         id: channelId,
         deleted: true,
       });
-      expect(mockActions.showSnackbarSimple.mock.calls[0][1]).toBe('Channel deleted');
     });
 
     it('should close the dialog when confirm button is clicked', async () => {
@@ -225,7 +217,7 @@ describe('channelActionsDropdown', () => {
   });
 
   describe('make private dialog', () => {
-    it('should open confirmation modal, call updateChannel action, and show snackbar when confirmed', async () => {
+    it('should open confirmation modal and call updateChannel action when confirmed', async () => {
       const dialogMessage = `Only users with view-only or edit permissions will be able to access Channel Test.`;
       const user = userEvent.setup();
 
@@ -245,7 +237,6 @@ describe('channelActionsDropdown', () => {
         id: channelId,
         isPublic: false,
       });
-      expect(mockActions.showSnackbarSimple.mock.calls[0][1]).toBe('Channel changed to private');
     });
 
     it('should close the dialog when confirm button is clicked', async () => {

From 548c8518c438c16a807b24985b1dac3879ff0b6c Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Sat, 1 Nov 2025 12:15:10 +0530
Subject: [PATCH 18/27] Updated

---
 .../pages/Channels/__tests__/channelActionsDropdown.spec.js   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index c51e4883b1..66dd5ebafb 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -35,6 +35,7 @@ const mockActions = {
   updateChannel: jest.fn(() => Promise.resolve()),
   deleteChannel: jest.fn(() => Promise.resolve()),
   getAdminChannelListDetails: jest.fn(() => Promise.resolve([channel])),
+  showSnackbarSimple: jest.fn(() => Promise.resolve()),
 };
 
 const createMockStore = (channelProps = {}) => {
@@ -60,6 +61,9 @@ const createMockStore = (channelProps = {}) => {
         },
       },
     },
+    actions: {
+      showSnackbarSimple: mockActions.showSnackbarSimple,
+    },
   });
 };
 

From 37f480b3e4522413f9df57d4180dc34bca9c0e43 Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Sat, 1 Nov 2025 12:55:48 +0530
Subject: [PATCH 19/27] Added download pdf and csv check

---
 .../__tests__/channelActionsDropdown.spec.js  | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index 66dd5ebafb..e967cdbc1c 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -30,11 +30,12 @@ jest.mock('shared/views/channel/mixins', () => ({
     },
   },
 }));
+const { generateChannelsPDF, generateChannelsCSV } = require('shared/views/channel/mixins')
+  .channelExportMixin.methods;
 
 const mockActions = {
   updateChannel: jest.fn(() => Promise.resolve()),
   deleteChannel: jest.fn(() => Promise.resolve()),
-  getAdminChannelListDetails: jest.fn(() => Promise.resolve([channel])),
   showSnackbarSimple: jest.fn(() => Promise.resolve()),
 };
 
@@ -57,7 +58,6 @@ const createMockStore = (channelProps = {}) => {
         actions: {
           updateChannel: mockActions.updateChannel,
           deleteChannel: mockActions.deleteChannel,
-          getAdminChannelListDetails: mockActions.getAdminChannelListDetails,
         },
       },
     },
@@ -255,6 +255,26 @@ describe('channelActionsDropdown', () => {
     });
   });
 
+  describe('download functionality', () => {
+    it('should call generateChannelsPDF and show snackbar when Download PDF is clicked', async () => {
+      const user = userEvent.setup();
+      renderComponent({ channelProps: { public: false, deleted: false } });
+
+      await user.click(screen.getByText('Download PDF'));
+
+      expect(generateChannelsPDF).toHaveBeenCalled();
+    });
+
+    it('should call generateChannelsCSV and show snackbar when Download CSV is clicked', async () => {
+      const user = userEvent.setup();
+      renderComponent({ channelProps: { public: false, deleted: false } });
+
+      await user.click(screen.getByText('Download CSV'));
+
+      expect(generateChannelsCSV).toHaveBeenCalled();
+    });
+  });
+
   describe('menu visibility', () => {
     it('should show correct menu items for deleted channel', () => {
       renderComponent({ channelProps: { deleted: true } });

From eac5b8a7914827248217c034efc54202470f694d Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Sat, 1 Nov 2025 13:06:53 +0530
Subject: [PATCH 20/27] updated the check the use action rather than
 channelexportmixin methods

---
 .../__tests__/channelActionsDropdown.spec.js  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index e967cdbc1c..84be4ef259 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -25,17 +25,16 @@ const channel = {
 jest.mock('shared/views/channel/mixins', () => ({
   channelExportMixin: {
     methods: {
-      generateChannelsPDF: jest.fn().mockResolvedValue(),
-      generateChannelsCSV: jest.fn().mockResolvedValue(),
+      generateChannelsPDF: jest.fn(() => Promise.resolve()),
+      generateChannelsCSV: jest.fn(() => Promise.resolve()),
     },
   },
 }));
-const { generateChannelsPDF, generateChannelsCSV } = require('shared/views/channel/mixins')
-  .channelExportMixin.methods;
 
 const mockActions = {
   updateChannel: jest.fn(() => Promise.resolve()),
   deleteChannel: jest.fn(() => Promise.resolve()),
+  getAdminChannelListDetails: jest.fn(() => Promise.resolve([channel])),
   showSnackbarSimple: jest.fn(() => Promise.resolve()),
 };
 
@@ -58,6 +57,7 @@ const createMockStore = (channelProps = {}) => {
         actions: {
           updateChannel: mockActions.updateChannel,
           deleteChannel: mockActions.deleteChannel,
+          getAdminChannelListDetails: mockActions.getAdminChannelListDetails,
         },
       },
     },
@@ -256,22 +256,26 @@ describe('channelActionsDropdown', () => {
   });
 
   describe('download functionality', () => {
-    it('should call generateChannelsPDF and show snackbar when Download PDF is clicked', async () => {
+    it('should call getAdminChannelListDetails when Download PDF is clicked', async () => {
       const user = userEvent.setup();
       renderComponent({ channelProps: { public: false, deleted: false } });
 
       await user.click(screen.getByText('Download PDF'));
 
-      expect(generateChannelsPDF).toHaveBeenCalled();
+      expect(mockActions.getAdminChannelListDetails).toHaveBeenCalledWith(expect.any(Object), [
+        channelId,
+      ]);
     });
 
-    it('should call generateChannelsCSV and show snackbar when Download CSV is clicked', async () => {
+    it('should call getAdminChannelListDetails when Download CSV is clicked', async () => {
       const user = userEvent.setup();
       renderComponent({ channelProps: { public: false, deleted: false } });
 
       await user.click(screen.getByText('Download CSV'));
 
-      expect(generateChannelsCSV).toHaveBeenCalled();
+      expect(mockActions.getAdminChannelListDetails).toHaveBeenCalledWith(expect.any(Object), [
+        channelId,
+      ]);
     });
   });
 

From 2fbe06734097b63c754b11e508c23cc69d4d3b72 Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Sat, 1 Nov 2025 13:11:59 +0530
Subject: [PATCH 21/27] updated the check the use action rather than
 channelexportmixin methods

---
 .../__tests__/channelActionsDropdown.spec.js     | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index 84be4ef259..84213678db 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -67,17 +67,29 @@ const createMockStore = (channelProps = {}) => {
   });
 };
 
+const createMockRouter = () => {
+  return new VueRouter({
+    routes: [
+      {
+        name: 'USERS',
+        path: '/users',
+        component: { template: '<div>Users Page</div>' },
+      },
+    ],
+  });
+};
+
 const renderComponent = (props = {}) => {
   const store = createMockStore(props.channelProps);
+  const router = createMockRouter();
 
   return render(ChannelActionsDropdown, {
     localVue,
     store,
     props: { channelId },
-    routes: new VueRouter(),
+    routes: router,
   });
 };
-
 describe('channelActionsDropdown', () => {
   beforeEach(() => {
     jest.clearAllMocks();

From 194aa5cbd3888f26ae9ceeffbff59e6d0a564b6a Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Sat, 1 Nov 2025 13:13:21 +0530
Subject: [PATCH 22/27] updated mockrouter

---
 .../pages/Channels/__tests__/channelActionsDropdown.spec.js      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index 84213678db..ef283c43e1 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -73,7 +73,6 @@ const createMockRouter = () => {
       {
         name: 'USERS',
         path: '/users',
-        component: { template: '<div>Users Page</div>' },
       },
     ],
   });

From ff30a88d43a916ea4b0e809da6870dd64c9d3069 Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Tue, 4 Nov 2025 23:33:34 +0530
Subject: [PATCH 23/27] Added studiobanner for error

---
 .../pages/Channels/ChannelActionsDropdown.vue | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
index bf535265ac..e2f3407d5e 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
@@ -12,13 +12,12 @@
       @cancel="activeDialog = null"
     >
       <p>{{ dialogConfig.message }}</p>
-      <div
+      <StudioBanner
         v-if="dialogConfig.errorMessage"
-        class="error-message"
-        :style="errorMessageStyles"
+        error
       >
         {{ dialogConfig.errorMessage }}
-      </div>
+      </StudioBanner>
     </KModal>
 
     <BaseMenu>
@@ -103,9 +102,13 @@
   import { RouteNames } from '../../constants';
   import { channelExportMixin } from 'shared/views/channel/mixins';
   import { CommunityLibraryStatus } from 'shared/constants';
+  import StudioBanner from 'shared/views/StudioBanner';
 
   export default {
     name: 'ChannelActionsDropdown',
+    components: {
+      StudioBanner,
+    },
     mixins: [channelExportMixin],
     props: {
       channelId: {
@@ -179,14 +182,6 @@
         }
         return '';
       },
-      errorMessageStyles() {
-        if (!this.dialogConfig.errorMessage) return {};
-
-        return {
-          color: this.$themeTokens.error,
-          backgroundColor: this.$themePalette.red.v_100,
-        };
-      },
     },
     methods: {
       ...mapActions('channelAdmin', [
@@ -257,13 +252,4 @@
 </script>
 
 
-<style lang="scss" scoped>
-
-  .error-message {
-    padding: 8px 12px;
-    margin-top: 8px;
-    font-size: 14px;
-    border-radius: 4px;
-  }
-
-</style>
+<style lang="scss" scoped></style>

From acdd36a02bb620b15e77c1457d97358a71ceb339 Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Wed, 5 Nov 2025 10:08:11 +0530
Subject: [PATCH 24/27] Added text color red to Studio Bannner

---
 .../contentcuration/frontend/shared/views/StudioBanner.vue   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/shared/views/StudioBanner.vue b/contentcuration/contentcuration/frontend/shared/views/StudioBanner.vue
index 5800501c20..bef1b213fe 100644
--- a/contentcuration/contentcuration/frontend/shared/views/StudioBanner.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/StudioBanner.vue
@@ -3,7 +3,10 @@
   <div
     class="banner"
     data-testid="studio-banner"
-    :style="{ backgroundColor: error ? $themePalette.red.v_100 : '' }"
+    :style="{
+      backgroundColor: error ? $themePalette.red.v_100 : '',
+      color: error ? $themeTokens.error : '',
+    }"
   >
     <slot>
       {{ text }}

From cd6039ba129affbb0370c0fccb38f4a8541eeb96 Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Fri, 7 Nov 2025 16:43:11 +0530
Subject: [PATCH 25/27] formatted the test better

---
 .../__tests__/channelActionsDropdown.spec.js  | 137 ++++++++----------
 1 file changed, 64 insertions(+), 73 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index ef283c43e1..47c69d218f 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -89,22 +89,52 @@ const renderComponent = (props = {}) => {
     routes: router,
   });
 };
+
 describe('channelActionsDropdown', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
+  describe('menu visibility', () => {
+    it('should show correct menu items for deleted channel', () => {
+      renderComponent({ channelProps: { deleted: true } });
+      expect(screen.getByText('Restore')).toBeVisible();
+      expect(screen.getByText('Delete permanently')).toBeVisible();
+      expect(screen.queryByText('Download PDF')).not.toBeInTheDocument();
+      expect(screen.queryByText('Make public')).not.toBeInTheDocument();
+    });
+
+    it('should show correct menu items for live private channel', () => {
+      renderComponent({ channelProps: { public: false, deleted: false } });
+      expect(screen.getByText('Download PDF')).toBeVisible();
+      expect(screen.getByText('Download CSV')).toBeVisible();
+      expect(screen.getByText('Make public')).toBeVisible();
+      expect(screen.getByText('Delete channel')).toBeVisible();
+      expect(screen.queryByText('Restore')).not.toBeInTheDocument();
+    });
+
+    it('should show correct menu items for live public channel', () => {
+      renderComponent({ channelProps: { public: true, deleted: false } });
+      expect(screen.getByText('Download PDF')).toBeVisible();
+      expect(screen.getByText('Download CSV')).toBeVisible();
+      expect(screen.getByText('Make private')).toBeVisible();
+      expect(screen.queryByText('Delete channel')).not.toBeInTheDocument();
+      expect(screen.queryByText('Restore')).not.toBeInTheDocument();
+    });
+  });
+
   describe('restore channel dialog', () => {
-    it('should open confirmation modal and call updateChannel action when confirmed', async () => {
-      const dialogMessage = `Are you sure you want to restore Channel Test and make it active again?`;
-      const user = userEvent.setup();
+    let user;
+    const dialogMessage = `Are you sure you want to restore Channel Test and make it active again?`;
 
+    beforeEach(async () => {
+      user = userEvent.setup();
       renderComponent({ channelProps: { deleted: true } });
-
       expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
-
       await user.click(screen.getByText('Restore'));
+    });
 
+    it('should open confirmation modal and call updateChannel action when confirmed', async () => {
       expect(screen.getByText(dialogMessage)).toBeInTheDocument();
       expect(screen.getByText('Restore channel')).toBeVisible();
 
@@ -118,28 +148,26 @@ describe('channelActionsDropdown', () => {
     });
 
     it('should close the dialog when confirm button is clicked', async () => {
-      const user = userEvent.setup();
-      renderComponent({ channelProps: { deleted: true } });
-
-      await user.click(screen.getByText('Restore'));
       const confirmButton = screen.getByRole('button', { name: 'Restore' });
       await user.click(confirmButton);
 
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+      expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
     });
   });
 
   describe('delete permanently dialog', () => {
-    it('should open confirmation modal and call deleteChannel action when confirmed', async () => {
-      const dialogMessage = `Are you sure you want to permanently delete Channel Test? This can not be undone.`;
-      const user = userEvent.setup();
+    let user;
+    const dialogMessage = `Are you sure you want to permanently delete Channel Test? This can not be undone.`;
 
+    beforeEach(async () => {
+      user = userEvent.setup();
       renderComponent({ channelProps: { deleted: true } });
-
       expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
-
       await user.click(screen.getByText('Delete permanently'));
+    });
 
+    it('should open confirmation modal and call deleteChannel action when confirmed', async () => {
       expect(screen.getByText(dialogMessage)).toBeInTheDocument();
       expect(screen.getByText('Permanently delete channel')).toBeVisible();
 
@@ -150,28 +178,26 @@ describe('channelActionsDropdown', () => {
     });
 
     it('should close the dialog when confirm button is clicked', async () => {
-      const user = userEvent.setup();
-      renderComponent({ channelProps: { deleted: true } });
-
-      await user.click(screen.getByText('Delete permanently'));
       const confirmButton = screen.getByRole('button', { name: 'Delete permanently' });
       await user.click(confirmButton);
 
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+      expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
     });
   });
 
   describe('make public dialog', () => {
-    it('should open confirmation modal and call updateChannel action when confirmed', async () => {
-      const dialogMessage = `All users will be able to view and import content from Channel Test.`;
-      const user = userEvent.setup();
+    let user;
+    const dialogMessage = `All users will be able to view and import content from Channel Test.`;
 
+    beforeEach(async () => {
+      user = userEvent.setup();
       renderComponent({ channelProps: { public: false, deleted: false } });
-
       expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
-
       await user.click(screen.getByText('Make public'));
+    });
 
+    it('should open confirmation modal and call updateChannel action when confirmed', async () => {
       expect(screen.getByText(dialogMessage)).toBeInTheDocument();
       expect(screen.getByText('Make channel public')).toBeVisible();
 
@@ -185,28 +211,26 @@ describe('channelActionsDropdown', () => {
     });
 
     it('should close the dialog when confirm button is clicked', async () => {
-      const user = userEvent.setup();
-      renderComponent({ channelProps: { public: false, deleted: false } });
-
-      await user.click(screen.getByText('Make public'));
       const confirmButton = screen.getByRole('button', { name: 'Make public' });
       await user.click(confirmButton);
 
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+      expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
     });
   });
 
   describe('delete channel dialog', () => {
-    it('should open confirmation modal and call updateChannel action when confirmed', async () => {
-      const dialogMessage = `Are you sure you want to delete Channel Test?`;
-      const user = userEvent.setup();
+    let user;
+    const dialogMessage = `Are you sure you want to delete Channel Test?`;
 
+    beforeEach(async () => {
+      user = userEvent.setup();
       renderComponent({ channelProps: { public: false, deleted: false } });
-
       expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
-
       await user.click(screen.getByText('Delete channel'));
+    });
 
+    it('should open confirmation modal and call updateChannel action when confirmed', async () => {
       expect(screen.getByText(dialogMessage)).toBeInTheDocument();
       expect(screen.getByRole('heading', { name: 'Delete channel' })).toBeVisible();
 
@@ -220,28 +244,26 @@ describe('channelActionsDropdown', () => {
     });
 
     it('should close the dialog when confirm button is clicked', async () => {
-      const user = userEvent.setup();
-      renderComponent({ channelProps: { public: false, deleted: false } });
-
-      await user.click(screen.getByText('Delete channel'));
       const confirmButton = screen.getByRole('button', { name: 'Delete' });
       await user.click(confirmButton);
 
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+      expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
     });
   });
 
   describe('make private dialog', () => {
-    it('should open confirmation modal and call updateChannel action when confirmed', async () => {
-      const dialogMessage = `Only users with view-only or edit permissions will be able to access Channel Test.`;
-      const user = userEvent.setup();
+    let user;
+    const dialogMessage = `Only users with view-only or edit permissions will be able to access Channel Test.`;
 
+    beforeEach(async () => {
+      user = userEvent.setup();
       renderComponent();
-
       expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
-
       await user.click(screen.getByText('Make private'));
+    });
 
+    it('should open confirmation modal and call updateChannel action when confirmed', async () => {
       expect(screen.getByText(dialogMessage)).toBeInTheDocument();
       expect(screen.getByText('Make channel private')).toBeVisible();
 
@@ -255,14 +277,11 @@ describe('channelActionsDropdown', () => {
     });
 
     it('should close the dialog when confirm button is clicked', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      await user.click(screen.getByText('Make private'));
       const confirmButton = screen.getByRole('button', { name: 'Make private' });
       await user.click(confirmButton);
 
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+      expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
     });
   });
 
@@ -289,32 +308,4 @@ describe('channelActionsDropdown', () => {
       ]);
     });
   });
-
-  describe('menu visibility', () => {
-    it('should show correct menu items for deleted channel', () => {
-      renderComponent({ channelProps: { deleted: true } });
-      expect(screen.getByText('Restore')).toBeVisible();
-      expect(screen.getByText('Delete permanently')).toBeVisible();
-      expect(screen.queryByText('Download PDF')).not.toBeInTheDocument();
-      expect(screen.queryByText('Make public')).not.toBeInTheDocument();
-    });
-
-    it('should show correct menu items for live private channel', () => {
-      renderComponent({ channelProps: { public: false, deleted: false } });
-      expect(screen.getByText('Download PDF')).toBeVisible();
-      expect(screen.getByText('Download CSV')).toBeVisible();
-      expect(screen.getByText('Make public')).toBeVisible();
-      expect(screen.getByText('Delete channel')).toBeVisible();
-      expect(screen.queryByText('Restore')).not.toBeInTheDocument();
-    });
-
-    it('should show correct menu items for live public channel', () => {
-      renderComponent({ channelProps: { public: true, deleted: false } });
-      expect(screen.getByText('Download PDF')).toBeVisible();
-      expect(screen.getByText('Download CSV')).toBeVisible();
-      expect(screen.getByText('Make private')).toBeVisible();
-      expect(screen.queryByText('Delete channel')).not.toBeInTheDocument();
-      expect(screen.queryByText('Restore')).not.toBeInTheDocument();
-    });
-  });
 });

From cd8bf313047692b6cdfcf7d905fb05e304ee439f Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Fri, 7 Nov 2025 16:46:58 +0530
Subject: [PATCH 26/27] ORDERED TEST

---
 .../__tests__/channelActionsDropdown.spec.js     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index 47c69d218f..1d42b6abb4 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -96,14 +96,6 @@ describe('channelActionsDropdown', () => {
   });
 
   describe('menu visibility', () => {
-    it('should show correct menu items for deleted channel', () => {
-      renderComponent({ channelProps: { deleted: true } });
-      expect(screen.getByText('Restore')).toBeVisible();
-      expect(screen.getByText('Delete permanently')).toBeVisible();
-      expect(screen.queryByText('Download PDF')).not.toBeInTheDocument();
-      expect(screen.queryByText('Make public')).not.toBeInTheDocument();
-    });
-
     it('should show correct menu items for live private channel', () => {
       renderComponent({ channelProps: { public: false, deleted: false } });
       expect(screen.getByText('Download PDF')).toBeVisible();
@@ -121,6 +113,14 @@ describe('channelActionsDropdown', () => {
       expect(screen.queryByText('Delete channel')).not.toBeInTheDocument();
       expect(screen.queryByText('Restore')).not.toBeInTheDocument();
     });
+
+    it('should show correct menu items for deleted channel', () => {
+      renderComponent({ channelProps: { deleted: true } });
+      expect(screen.getByText('Restore')).toBeVisible();
+      expect(screen.getByText('Delete permanently')).toBeVisible();
+      expect(screen.queryByText('Download PDF')).not.toBeInTheDocument();
+      expect(screen.queryByText('Make public')).not.toBeInTheDocument();
+    });
   });
 
   describe('restore channel dialog', () => {

From 6a94956bb1ca88330390fae2e6c7eb8ba67ddfeb Mon Sep 17 00:00:00 2001
From: Prashant-thakur77 <prashant101007@gmail.com>
Date: Fri, 7 Nov 2025 16:54:00 +0530
Subject: [PATCH 27/27] formatted the test better

---
 .../pages/Channels/__tests__/channelActionsDropdown.spec.js  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
index 1d42b6abb4..f4bf9e91e0 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/__tests__/channelActionsDropdown.spec.js
@@ -130,6 +130,7 @@ describe('channelActionsDropdown', () => {
     beforeEach(async () => {
       user = userEvent.setup();
       renderComponent({ channelProps: { deleted: true } });
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
       expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
       await user.click(screen.getByText('Restore'));
     });
@@ -163,6 +164,7 @@ describe('channelActionsDropdown', () => {
     beforeEach(async () => {
       user = userEvent.setup();
       renderComponent({ channelProps: { deleted: true } });
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
       expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
       await user.click(screen.getByText('Delete permanently'));
     });
@@ -193,6 +195,7 @@ describe('channelActionsDropdown', () => {
     beforeEach(async () => {
       user = userEvent.setup();
       renderComponent({ channelProps: { public: false, deleted: false } });
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
       expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
       await user.click(screen.getByText('Make public'));
     });
@@ -226,6 +229,7 @@ describe('channelActionsDropdown', () => {
     beforeEach(async () => {
       user = userEvent.setup();
       renderComponent({ channelProps: { public: false, deleted: false } });
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
       expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
       await user.click(screen.getByText('Delete channel'));
     });
@@ -260,6 +264,7 @@ describe('channelActionsDropdown', () => {
       user = userEvent.setup();
       renderComponent();
       expect(screen.queryByText(dialogMessage)).not.toBeInTheDocument();
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
       await user.click(screen.getByText('Make private'));
     });