Skip to content

Commit 3e92fc3

Browse files
committed
fix: produce maxquant reports
1 parent 38fc379 commit 3e92fc3

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

tests/test_maxquant.nf.test.snap

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Test maxquant profile": {
33
"content": [
4-
18,
4+
20,
55
{
66
"CUSTOM_FILTERDIFFERENTIALTABLE": {
77
"pandas": "1.5.2"
@@ -96,6 +96,9 @@
9696
"plots/qc/genotype_celltype_t1_FoB_PXD043349.limma.mean_difference.png",
9797
"plots/qc/genotype_celltype_t1_MZ_fakeBatch_PXD043349.limma.mean_difference.png",
9898
"plots/qc/genotype_celltype_t1_t2_PXD043349.limma.mean_difference.png",
99+
"report",
100+
"report/PXD043349.html",
101+
"report/PXD043349.zip",
99102
"tables",
100103
"tables/differential",
101104
"tables/differential/fakebatch_fakeBatch_b1_b2_PXD043349.limma.results.tsv",
@@ -132,11 +135,11 @@
132135
"nf-test": "0.9.2",
133136
"nextflow": "25.04.6"
134137
},
135-
"timestamp": "2025-07-04T14:48:41.26663445"
138+
"timestamp": "2025-07-08T17:33:41.371291143"
136139
},
137140
"Test maxquant profile - with toolsheet": {
138141
"content": [
139-
18,
142+
20,
140143
{
141144
"CUSTOM_FILTERDIFFERENTIALTABLE": {
142145
"pandas": "1.5.2"
@@ -231,6 +234,9 @@
231234
"plots/qc/genotype_celltype_t1_FoB_PXD043349.limma.mean_difference.png",
232235
"plots/qc/genotype_celltype_t1_MZ_fakeBatch_PXD043349.limma.mean_difference.png",
233236
"plots/qc/genotype_celltype_t1_t2_PXD043349.limma.mean_difference.png",
237+
"report",
238+
"report/PXD043349.html",
239+
"report/PXD043349.zip",
234240
"tables",
235241
"tables/differential",
236242
"tables/differential/fakebatch_fakeBatch_b1_b2_PXD043349.limma.results.tsv",
@@ -267,6 +273,6 @@
267273
"nf-test": "0.9.2",
268274
"nextflow": "25.04.6"
269275
},
270-
"timestamp": "2025-07-04T14:50:27.019845456"
276+
"timestamp": "2025-07-08T17:36:28.712143005"
271277
}
272278
}

workflows/differentialabundance.nf

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -676,9 +676,6 @@ workflow DIFFERENTIALABUNDANCE {
676676

677677
// Make (and optionally deploy) the shinyngs app
678678

679-
ch_shinyngs = ch_paramsets
680-
.filter{ it.params.shinyngs_build_app }
681-
682679
// To prepare the input for shinyngs app we need to first make sure that the differential
683680
// results are parsed in the same order as the contrast file
684681
// To do so, as we cannot rely on the order of the channels as they are asynchronous, we
@@ -687,7 +684,7 @@ workflow DIFFERENTIALABUNDANCE {
687684

688685
// Create a channel with the differential results and the corresponding map with
689686
// the contrast entries
690-
differential_with_contrast = ch_shinyngs
687+
differential_with_contrast = ch_paramsets
691688
.join( ch_differential_results
692689
.filter { meta, contrast, results -> contrast.variable?.trim() }
693690
.groupTuple()
@@ -715,7 +712,7 @@ workflow DIFFERENTIALABUNDANCE {
715712
}
716713
// parse the channel to have the contrast file with the corresponding meta
717714
.map { [it.baseName, it] }
718-
.join( ch_shinyngs.map { [it.paramset_name, it] } )
715+
.join( ch_paramsets.map { [it.paramset_name, it] } )
719716
.map { paramset_name, contrast_file, meta ->
720717
[meta, contrast_file]
721718
}
@@ -724,12 +721,14 @@ workflow DIFFERENTIALABUNDANCE {
724721
ch_shinyngs_input = differential_with_contrast.differential_results
725722
.join(ch_contrasts_sorted)
726723
.join(ch_all_matrices)
724+
.filter { row ->
725+
row[0].params.shinyngs_build_app
726+
}
727727
.multiMap { meta, meta_with_contrast, differential_results, contrast_file, samplesheet, features, matrices ->
728728
matrices: [meta, samplesheet, features, matrices]
729729
contrasts_and_differential: [meta, contrast_file, differential_results]
730730
contrast_stats_assay: meta.params.exploratory_assay_names.split(',').findIndexOf { it == meta.params.exploratory_final_assay } + 1
731731
}
732-
733732
SHINYNGS_APP(
734733
ch_shinyngs_input.matrices, // meta, samples, features, [ matrices ]
735734
ch_shinyngs_input.contrasts_and_differential, // meta, contrast file, [ differential results ]

0 commit comments

Comments
 (0)