From 864b5893cc997b1216cb1ad1d787183783ed02ff Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Wed, 24 Jul 2024 15:09:17 -0700
Subject: [PATCH 1/4] Clipboard: Checkboxes used wrong event `click` when
 `input` is expected

- Stops propagation in Checkbox#handleChange w/ second `$event`
paramter, putting `.stop` and/or `.prevent` on the `@input` event
complained and failed
- Fixes checkboxes just not working in the Clipboard
---
 .../frontend/channelEdit/components/Clipboard/Channel.vue    | 4 ++--
 .../channelEdit/components/Clipboard/ContentNode.vue         | 2 +-
 .../frontend/channelEdit/components/Clipboard/index.vue      | 4 ++--
 .../contentcuration/frontend/shared/views/form/Checkbox.vue  | 5 +++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/Channel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/Channel.vue
index 1f95da625c..4d57bbac8e 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/Channel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/Channel.vue
@@ -12,9 +12,9 @@
           <Checkbox
             ref="checkbox"
             class="ma-0 pa-0"
-            :value="selected"
+            :inputValue="selected"
             :indeterminate="indeterminate"
-            @click.stop.prevent="goNextSelectionState"
+            @input="goNextSelectionState"
           />
         </VListTileAction>
         <div class="mr-2">
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue
index 8869724e9a..dd72e4d37e 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue
@@ -34,7 +34,7 @@
                         class="mt-0 pt-0"
                         :inputValue="selected"
                         :indeterminate="indeterminate"
-                        @click.stop.prevent="goNextSelectionState"
+                        @input="goNextSelectionState"
                       />
                     </VListTileAction>
                     <div
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
index ab391958fa..ac8fe9e677 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
@@ -35,10 +35,10 @@
                     <Checkbox
                       ref="checkbox"
                       class="ma-0 pa-0"
-                      :value="selected"
+                      :inputValue="selected"
                       :label="selectionState ? '' : $tr('selectAll')"
                       :indeterminate="indeterminate"
-                      @click.stop.prevent="goNextSelectionState"
+                      @input="goNextSelectionState"
                     />
                   </VListTileAction>
                 </VSlideXTransition>
diff --git a/contentcuration/contentcuration/frontend/shared/views/form/Checkbox.vue b/contentcuration/contentcuration/frontend/shared/views/form/Checkbox.vue
index fab75de77f..3ca507ca20 100644
--- a/contentcuration/contentcuration/frontend/shared/views/form/Checkbox.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/form/Checkbox.vue
@@ -127,7 +127,8 @@
       },
     },
     methods: {
-      handleChange(checked) {
+      handleChange(checked, e) {
+        e.stopPropagation();
         this.isChecked = checked;
       },
       updateInputValue(newValue) {
@@ -146,4 +147,4 @@
     color: var(--v-text);
   }
 
-</style>
\ No newline at end of file
+</style>

From 39ff0e200c978a6099cafbe567b9f258a7611c1c Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Fri, 9 Aug 2024 13:42:24 -0500
Subject: [PATCH 2/4] Add moveNodeIds prop to MoveModal within Clipboard and
 map clipboard selectedNodeIds to the correct content node id

---
 .../channelEdit/components/Clipboard/ContentNodeOptions.vue  | 2 +-
 .../frontend/channelEdit/components/Clipboard/index.vue      | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
index b8aaf5380f..5261ac2e51 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
@@ -9,7 +9,7 @@
     </VListTile>
     <VListTile v-if="allowMove" @click.stop="calculateMoveNodes">
       <VListTileTitle>{{ $tr('moveTo') }}</VListTileTitle>
-      <MoveModal v-if="moveModalOpen" ref="moveModal" v-model="moveModalOpen" @target="moveNodes" />
+      <MoveModal v-if="moveModalOpen" ref="moveModal" v-model="moveModalOpen" @target="moveNodes"  :moveNodeIds="[contentNode.id]"/>
     </VListTile>
     <VListTile @click="removeNode()">
       <VListTileTitle>{{ $tr('remove') }}</VListTileTitle>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
index ac8fe9e677..de152e0cb6 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
@@ -70,6 +70,7 @@
                       <MoveModal
                         v-if="allowMove && moveModalOpen"
                         ref="moveModal"
+                        :moveNodeIds="selectedSourceNodeIds"
                         v-model="moveModalOpen"
                         @target="moveNodes"
                       />
@@ -207,6 +208,7 @@
         'getMoveTrees',
         'legacyNodesSelected',
         'previewSourceNode',
+        'getContentNodeForRender',
       ]),
       ...mapGetters('contentNode', {
         getRealContentNodes: 'getContentNodes',
@@ -243,6 +245,9 @@
           ? DropEffect.COPY
           : DropEffect.NONE;
       },
+      selectedSourceNodeIds(){
+        return this.selectedNodeIds.map(this.getContentNodeForRender).map(n => n.id)
+      },
     },
     watch: {
       open(open) {

From c6217827dd969b3d15b2df027da612ae7da9bdbd Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Fri, 9 Aug 2024 13:54:49 -0500
Subject: [PATCH 3/4] Fix linting errors

---
 .../components/Clipboard/ContentNodeOptions.vue           | 8 +++++++-
 .../frontend/channelEdit/components/Clipboard/index.vue   | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
index 5261ac2e51..1e8c06b37a 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
@@ -9,7 +9,13 @@
     </VListTile>
     <VListTile v-if="allowMove" @click.stop="calculateMoveNodes">
       <VListTileTitle>{{ $tr('moveTo') }}</VListTileTitle>
-      <MoveModal v-if="moveModalOpen" ref="moveModal" v-model="moveModalOpen" @target="moveNodes"  :moveNodeIds="[contentNode.id]"/>
+      <MoveModal 
+        v-if="moveModalOpen" 
+        ref="moveModal" 
+        v-model="moveModalOpen" 
+        :moveNodeIds="[contentNode.id]" 
+        @target="moveNodes" 
+      />
     </VListTile>
     <VListTile @click="removeNode()">
       <VListTileTitle>{{ $tr('remove') }}</VListTileTitle>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
index de152e0cb6..3add0cc8a9 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
@@ -70,8 +70,8 @@
                       <MoveModal
                         v-if="allowMove && moveModalOpen"
                         ref="moveModal"
-                        :moveNodeIds="selectedSourceNodeIds"
                         v-model="moveModalOpen"
+                        :moveNodeIds="selectedSourceNodeIds"
                         @target="moveNodes"
                       />
                       <IconButton
@@ -245,8 +245,8 @@
           ? DropEffect.COPY
           : DropEffect.NONE;
       },
-      selectedSourceNodeIds(){
-        return this.selectedNodeIds.map(this.getContentNodeForRender).map(n => n.id)
+      selectedSourceNodeIds() {
+        return this.selectedNodeIds.map(this.getContentNodeForRender).map(n => n.id);
       },
     },
     watch: {

From a5dfad69750c22f5b32d01dd988936a39ae009e4 Mon Sep 17 00:00:00 2001
From: Liana Harris <46411498+LianaHarris360@users.noreply.github.com>
Date: Tue, 20 Aug 2024 11:52:41 -0500
Subject: [PATCH 4/4] Correct clipboard resource and topic folder counts

---
 .../components/Clipboard/ContentNode.vue      |  9 ++++++--
 .../Clipboard/ContentNodeOptions.vue          | 18 +++++++++++++--
 .../components/Clipboard/index.vue            | 22 ++++++++++++++-----
 .../channelEdit/components/move/MoveModal.vue |  9 +++++++-
 4 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue
index dd72e4d37e..2c8139a390 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue
@@ -55,7 +55,7 @@
                       </VListTileContent>
                       <VListTileAction style="min-width: unset;" class="pl-3 pr-1">
                         <div class="badge caption font-weight-bold">
-                          {{ contentNode.resource_count }}
+                          {{ contentNodeResourceCount }}
                         </div>
                       </VListTileAction>
                       <!-- Custom placement of dropdown indicator -->
@@ -117,7 +117,7 @@
 </template>
 <script>
 
-  import { mapActions, mapGetters } from 'vuex';
+  import { mapActions, mapGetters, mapState } from 'vuex';
   import clipboardMixin, { parentMixin } from './mixins';
   import ContentNodeOptions from './ContentNodeOptions';
   import Checkbox from 'shared/views/form/Checkbox';
@@ -150,6 +150,7 @@
       };
     },
     computed: {
+      ...mapState('clipboard', ['clipboardNodesMap']),
       ...mapGetters('clipboard', ['isPreloading', 'isLoaded']),
       thumbnailAttrs() {
         if (this.contentNode) {
@@ -181,6 +182,10 @@
         const contentNode = this.contentNode || {};
         return { ...contentNode, clipboardNodeId: this.nodeId };
       },
+      contentNodeResourceCount() {
+        return Object.values(this.clipboardNodesMap).filter(node => node.parent === this.nodeId)
+          .length;
+      },
     },
     watch: {
       open(open) {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
index 1e8c06b37a..4256eb0e5b 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNodeOptions.vue
@@ -13,7 +13,7 @@
         v-if="moveModalOpen" 
         ref="moveModal" 
         v-model="moveModalOpen" 
-        :moveNodeIds="[contentNode.id]" 
+        :clipboardTopicResourceCount="topicAndResourceCount"
         @target="moveNodes" 
       />
     </VListTile>
@@ -26,7 +26,7 @@
 
 <script>
 
-  import { mapActions, mapGetters } from 'vuex';
+  import { mapActions, mapGetters, mapState } from 'vuex';
   import { RouteNames } from '../../constants';
   import MoveModal from '../move/MoveModal';
   import clipboardMixin from './mixins';
@@ -46,6 +46,7 @@
       };
     },
     computed: {
+      ...mapState('clipboard', ['clipboardNodesMap']),
       ...mapGetters('clipboard', ['getMoveTrees', 'isLegacyNode']),
       isLegacy() {
         return this.isLegacyNode(this.nodeId);
@@ -66,6 +67,19 @@
         });
         return `${channelURI}${sourceNode.href}`;
       },
+      topicAndResourceCount() {
+        let topicCount = 0;
+        let resourceCount = 0;
+        if (this.contentNode.kind === 'topic') {
+          topicCount = 1;
+          resourceCount = Object.values(this.clipboardNodesMap).filter(
+            node => node.parent === this.nodeId
+          ).length;
+        } else {
+          resourceCount = 1;
+        }
+        return { topicCount: topicCount, resourceCount: resourceCount };
+      },
     },
     methods: {
       ...mapActions(['showSnackbar']),
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
index 3add0cc8a9..13659c5c7d 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/index.vue
@@ -71,7 +71,8 @@
                         v-if="allowMove && moveModalOpen"
                         ref="moveModal"
                         v-model="moveModalOpen"
-                        :moveNodeIds="selectedSourceNodeIds"
+                        :moveNodeIds="selectedNodeIds"
+                        :clipboardTopicResourceCount="topicAndResourceCount"
                         @target="moveNodes"
                       />
                       <IconButton
@@ -200,7 +201,7 @@
     },
     computed: {
       ...mapGetters(['clipboardRootId']),
-      ...mapState('clipboard', ['initializing']),
+      ...mapState('clipboard', ['initializing', 'clipboardNodesMap']),
       ...mapGetters('clipboard', [
         'channels',
         'selectedNodeIds',
@@ -208,7 +209,6 @@
         'getMoveTrees',
         'legacyNodesSelected',
         'previewSourceNode',
-        'getContentNodeForRender',
       ]),
       ...mapGetters('contentNode', {
         getRealContentNodes: 'getContentNodes',
@@ -245,8 +245,20 @@
           ? DropEffect.COPY
           : DropEffect.NONE;
       },
-      selectedSourceNodeIds() {
-        return this.selectedNodeIds.map(this.getContentNodeForRender).map(n => n.id);
+      topicAndResourceCount() {
+        let topicCount = 0;
+        let resourceCount = 0;
+        this.selectedNodeIds.forEach(id => {
+          const kind = this.clipboardNodesMap[id]?.kind;
+          if (kind === 'topic' || !kind) {
+            // Increment topicCount if kind is "topic" or not set
+            topicCount++;
+          } else {
+            // Increment resourceCount for any other kind
+            resourceCount++;
+          }
+        });
+        return { topicCount: topicCount, resourceCount: resourceCount };
       },
     },
     watch: {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue
index d05b4e2150..a68c50d51b 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue
@@ -173,6 +173,10 @@
         type: Boolean,
         default: false,
       },
+      clipboardTopicResourceCount: {
+        type: Object,
+        default: () => ({}),
+      },
     },
     data() {
       return {
@@ -200,7 +204,10 @@
         },
       },
       moveHeader() {
-        return this.$tr('moveItems', this.getTopicAndResourceCounts(this.moveNodeIds));
+        const resourceCounts = Object.keys(this.clipboardTopicResourceCount).length
+          ? this.clipboardTopicResourceCount
+          : this.getTopicAndResourceCounts(this.moveNodeIds);
+        return this.$tr('moveItems', resourceCounts);
       },
       moveHereButtonDisabled() {
         if (this.moveNodesInProgress) {