Merge pull request #48 from stekaz/uniqueEntries

Fix the uniqueEntries filtering
nextflow-io · Sep 9, 2024 · b5e6370 · b5e6370
2 parents 54c96b0 + 7bd837b
commit b5e6370
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 1. The help parameters are now no longer unexpected parameters when validating parameters.
 2. Fixed a typo in the docs
 3. Added a URL to the help message migration docs to the `paramsHelp()` deprecation message
+4. Resolved an issue where the UniqueEntriesEvaluator did not correctly detect non-unique combinations.
 
 # Version 2.1.0 - Tantanmen
 

diff --git a/...ins/nf-schema/src/main/nextflow/validation/CustomEvaluators/UniqueEntriesEvaluator.groovy b/...ins/nf-schema/src/main/nextflow/validation/CustomEvaluators/UniqueEntriesEvaluator.groovy
@@ -40,7 +40,7 @@ class UniqueEntriesEvaluator implements Evaluator {
             }
             def Map<String,JsonNode> filteredNodes = nodeEntry
                 .asObject()
-                .dropWhile { k,v -> !uniqueEntries.contains(k) }
+                .findAll { k,v -> uniqueEntries.contains(k) }
                 .collectEntries { k,v -> [k, v.asString()] }
             for (uniqueNode : uniques) {
                 if(filteredNodes.equals(uniqueNode)) {
@@ -52,4 +52,4 @@ class UniqueEntriesEvaluator implements Evaluator {
 
         return Evaluator.Result.success()
     }
-}
+}