bug fix to return Map but not Set on empty filter

stjude · Feb 20, 2025 · 2e93e35 · 2e93e35
1 parent 88da674
commit 2e93e35
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/server/routes/termdb.cluster.ts b/server/routes/termdb.cluster.ts
@@ -261,7 +261,7 @@ async function validateNative(q: GeneExpressionQueryNative, ds: any, genome: any
 		const limitSamples = await mayLimitSamples(param, q.samples, ds)
 		if (limitSamples?.size == 0) {
 			// got 0 sample after filtering, must still return expected structure with no data
-			return { term2sample2value: new Set(), byTermId: {}, bySampleId: {} }
+			return { term2sample2value: new Map(), byTermId: {}, bySampleId: {} }
 		}
 
 		// has at least 1 sample passing filter and with exp data

diff --git a/server/src/termdb.matrix.js b/server/src/termdb.matrix.js
@@ -161,21 +161,20 @@ async function getSampleData(q, ds, onlyChildren = false) {
 				filter0: q.filter0
 			}
 			const data = await q.ds.queries[tw.term.type].get(args)
-			if (data.term2sample2value.size > 0)
-				for (const sampleId in data.term2sample2value.get(tw.term.name)) {
-					if (!(sampleId in samples)) {
-						samples[sampleId] = { sample: sampleId }
-					}
-					const values = data.term2sample2value.get(tw.term.name)
-					const value = Number(values[sampleId])
-					let key = value
-					if (lstOfBins) {
-						// term is in binning mode. key should be changed into the label of the bin to which value belongs
-						const bin = getBin(lstOfBins, value)
-						key = get_bin_label(lstOfBins[bin], tw.q)
-					}
-					samples[sampleId][tw.$id] = { key, value }
+			for (const sampleId in data.term2sample2value.get(tw.term.name)) {
+				if (!(sampleId in samples)) {
+					samples[sampleId] = { sample: sampleId }
 				}
+				const values = data.term2sample2value.get(tw.term.name)
+				const value = Number(values[sampleId])
+				let key = value
+				if (lstOfBins) {
+					// term is in binning mode. key should be changed into the label of the bin to which value belongs
+					const bin = getBin(lstOfBins, value)
+					key = get_bin_label(lstOfBins[bin], tw.q)
+				}
+				samples[sampleId][tw.$id] = { key, value }
+			}
 		} else if (tw.term.type == TermTypes.SINGLECELL_GENE_EXPRESSION) {
 			if (!q.ds.queries?.singleCell?.geneExpression) throw 'not supported by dataset: singleCell.geneExpression'
 			let lst // list of bins based on tw config