Skip to content

Feature/issue 261 export tags -Prune unrelated channel IDs from exported channel tags #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eddcomeau wants to merge 3 commits into
base: main
Choose a base branch
from
+12 −4
Open

Feature/issue 261 export tags -Prune unrelated channel IDs from exported channel tags #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
166ac6e
Prune unrelated channel IDs from exported tags
eddcomeau Apr 10, 2026
61cbf7a
Prune unrelated channel IDs from client exports
eddcomeau Apr 10, 2026
1ba0aeb
Merge branch 'main' into feature/issue-261-export-tags
eddcomeau Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion client/src/com/mirth/connect/client/ui/ChannelPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,7 +1928,9 @@ private void addTagsToChannel(Channel channel) {
List<ChannelTag> channelTags = new ArrayList<ChannelTag>();
for (ChannelTag channelTag : getCachedChannelTags()) {
if (channelTag.getChannelIds().contains(channel.getId())) {
channelTags.add(channelTag);
ChannelTag exportTag = new ChannelTag(channelTag);
exportTag.setChannelIds(Collections.singleton(channel.getId()));
channelTags.add(exportTag);
}
}

Expand Down
7 changes: 6 additions & 1 deletion server/src/com/mirth/connect/server/api/servlets/ChannelServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,11 @@ protected void addExportData(Channel channel, Map<String, ChannelMetadata> chann
channel.getExportData().setChannelTags(channelTags
.stream()
.filter(tag -> tag.getChannelIds().contains(channel.getId()))
.map(tag -> {
ChannelTag exportTag = new ChannelTag(tag);
exportTag.setChannelIds(Collections.singleton(channel.getId()));
return exportTag;
})
.collect(Collectors.toList()));

channel.getExportData().setDependencyIds(channelDependencies
Expand Down Expand Up @@ -347,4 +352,4 @@ private List<CodeTemplateLibrary> getCodeTemplateLibraries() {
}
return codeTemplateLibraries;
}
}
}
5 changes: 3 additions & 2 deletions server/test/com/mirth/connect/server/api/servlets/ChannelServletTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ private void verifyChannel1(Channel channel, boolean includeCodeTemplateLibrarie
assertEquals(Integer.valueOf(7), exportData.getMetadata().getPruningSettings().getPruneContentDays());

assertEquals(2, exportData.getChannelTags().size());
assertTrue(exportData.getChannelTags().contains(new ChannelTag("tag1", "Tag 1", new HashSet<>(Arrays.asList(new String[] { CHANNEL_ID_1, CHANNEL_ID_2 })))));
assertTrue(exportData.getChannelTags().contains(new ChannelTag("tag2", "Tag 2", new HashSet<>(Arrays.asList(new String[] { CHANNEL_ID_1, CHANNEL_ID_3 })))));
assertTrue(exportData.getChannelTags().contains(new ChannelTag("tag1", "Tag 1", new HashSet<>(Arrays.asList(new String[] { CHANNEL_ID_1 })))));
assertTrue(exportData.getChannelTags().contains(new ChannelTag("tag2", "Tag 2", new HashSet<>(Arrays.asList(new String[] { CHANNEL_ID_1 })))));

assertEquals(1, exportData.getDependencyIds().size());
assertTrue(exportData.getDependencyIds().contains(CHANNEL_ID_2));
Expand Down Expand Up @@ -234,3 +234,4 @@ protected boolean isUserAuthorized() {
}

}