@sjcrh/proteinpaint-shared 2.79.3 → 2.83.0

package/package.json

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

package/src/helpers.js

@@ -29,3 +29,22 @@ export function convertUnits(v, fromUnit, toUnit, scaleFactor, compact) {
 	if (compact) return `${toUnitV}${toUnit.charAt(0)}${fromUnitV}${fromUnit.charAt(0)}`
 	return `${toUnitV} ${toUnitV > 1 ? toUnit + 's' : toUnit} ${fromUnitV} ${fromUnitV > 1 ? fromUnit + 's' : fromUnit}`
 }
+
+export function deepEqual(x, y) {
+	if (x === y) {
+		return true
+	} else if (typeof x == 'object' && x != null && typeof y == 'object' && y != null) {
+		if (Object.keys(x).length != Object.keys(y).length) {
+			return false
+		}
+
+		for (var prop in x) {
+			if (y.hasOwnProperty(prop)) {
+				if (!deepEqual(x[prop], y[prop])) return false
+			} else {
+				return false
+			}
+		}
+		return true
+	} else return false
+}

package/src/termdb.usecase.js

@@ -97,6 +97,16 @@ export function isUsableTerm(term, _usecase, termdbConfig, ds) {
 				if (!term.isleaf) uses.add('branch')
 			}
 			return uses
+		case 'numericDictTermCluster':
+			if (!usecase.detail?.exclude?.includes(term.id)) {
+				if (isNumericTerm(term)) {
+					uses.add('plot')
+				}
+				if (hasNumericChild(child_types)) {
+					uses.add('branch')
+				}
+			}
+			return uses
 
 		case 'profile':
 			if (!term.isleaf) {

package/src/terms.js

@@ -39,6 +39,8 @@ export const TermTypes = {
 	SINGLECELL_CELLTYPE: 'singleCellCellType'
 }
 
+export const NUMERIC_DICTIONARY_TERM = 'numericDictTerm'
+
 export const TermTypes2Dt = {
 	[TermTypes.GENE_EXPRESSION]: dtgeneexpression,
 	[TermTypes.METABOLITE_INTENSITY]: dtmetaboliteintensity
@@ -163,11 +165,11 @@ export function getSampleType(term, ds) {
 }
 
 export function getParentType(types, ds) {
-	if (ds.cohort.termdb.sampleTypes.size == 0) return null //dataset only has one type of sample
+	if (Object.keys(ds.cohort.termdb.sampleTypes).length == 0) return null //dataset only has one type of sample
 	const ids = Array.from(types)
 	if (!ids || ids.length == 0) return null
 	for (const id of ids) {
-		const typeObj = ds.cohort.termdb.sampleTypes.get(id)
+		const typeObj = ds.cohort.termdb.sampleTypes[id]
 		if (typeObj.parent_id == null) return id //this is the root type
 		//if my parent is in the list, then I am not the parent
 		if (ids.includes(typeObj.parent_id)) continue