Prune unrelated channel IDs from client exports

Signed-off-by: DESKTOP-9AKG4SL\ecomeau <ecomeau@caredx.com>

Author: eddcomeau

client/src/com/mirth/connect/client/ui/ChannelPanel.java

@@ -1924,17 +1924,19 @@ private void addDependenciesToChannel(Channel channel) {
         }
     }
 
-    private void addTagsToChannel(Channel channel) {
-        List<ChannelTag> channelTags = new ArrayList<ChannelTag>();
-        for (ChannelTag channelTag : getCachedChannelTags()) {
-            if (channelTag.getChannelIds().contains(channel.getId())) {
-                channelTags.add(channelTag);
-            }
-        }
-
-        if (CollectionUtils.isNotEmpty(channelTags)) {
-            channel.getExportData().setChannelTags(channelTags);
-        }
+    private void addTagsToChannel(Channel channel) {
+        List<ChannelTag> channelTags = new ArrayList<ChannelTag>();
+        for (ChannelTag channelTag : getCachedChannelTags()) {
+            if (channelTag.getChannelIds().contains(channel.getId())) {
+                ChannelTag exportTag = new ChannelTag(channelTag);
+                exportTag.setChannelIds(Collections.singleton(channel.getId()));
+                channelTags.add(exportTag);
+            }
+        }
+
+        if (CollectionUtils.isNotEmpty(channelTags)) {
+            channel.getExportData().setChannelTags(channelTags);
+        }
     }
 
     public boolean doExportAllGroups() {
@@ -3840,3 +3842,4 @@ private void initLayout() {
 
     private JTabbedPane tabPane;
 }
+