@sjcrh/proteinpaint-shared 2.149.0 → 2.152.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjcrh/proteinpaint-shared",
-  "version": "2.149.0",
+  "version": "2.152.0",
   "description": "ProteinPaint code that is shared between server and client-side workspaces",
   "type": "module",
   "main": "src/index.js",

package/src/termdb.bins.js

@@ -267,7 +267,7 @@ export function get_bin_label(bin, binconfig, valueConversion) {
 	/*
   Generate a numeric bin label given a bin configuration and an optional term valueConversion object
 */
-	if ('label' in bin) return bin.label
+	if (bin.label) return bin.label
 
 	const bc = binconfig
 	if (!bc.binLabelFormatter) bc.binLabelFormatter = getNumDecimalsFormatter(bc)
@@ -359,10 +359,13 @@ export function get_bin_label(bin, binconfig, valueConversion) {
 export function get_bin_range_equation(bin, binconfig) {
 	const x = '<span style="font-family:Times;font-style:italic;">x</span>'
 	let range_eq
-	const bin_label = get_bin_label(bin, binconfig)
+	// should always use computed (not user-customized) bin label to determine bin range text
+	const copy = structuredClone(bin)
+	copy.label = '' // mutate only the copy, and not the original bin argument
+	const bin_label = get_bin_label(copy, binconfig)
 	if (bin.startunbounded || bin.stopunbounded) {
 		// first or last bins, e.g. x ≤ 14 and x > 16
-		range_eq = x + '&nbsp;' + bin_label
+		range_eq = x + ' ' + bin_label
 	} else if (bin.startinclusive) {
 		// bins with startinclusive, e.g. 14 ≤ x < 16
 		range_eq = bin_label.replace('to <', '≤ ' + x + ' <')

package/src/terms.js

@@ -181,8 +181,7 @@ export function getSampleType(term, ds) {
 	if (term.type == 'samplelst') {
 		const key = Object.keys(term.values)[0]
 		const sampleId = term.values[key].list[0]?.sampleId
-		// sampleId2Type expects number as key
-		if (sampleId) return ds.sampleId2Type.get(Number(sampleId))
+		if (sampleId) return ds.sampleId2Type.get(Number(sampleId) || sampleId)
 		else return DEFAULT_SAMPLE_TYPE
 	}
 	// samplelst or non dict terms