@sjcrh/proteinpaint-shared 2.116.1-1 → 2.118.0

package/package.json

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

package/src/common.js

@@ -1216,81 +1216,6 @@ for (const _dtTerm of _dtTerms) {
 	}
 }
 
-const dtFilter = {
-	opts: { joinWith: ['and', 'or'] },
-	terms: dtTerms
-}
-
-const groupsetLst = []
-for (const term of dtTerms) {
-	// wildtype filter
-	const WTfilter = structuredClone(dtFilter)
-	WTfilter.group = 2
-	const WT = 'WT'
-	const WTvalue = { key: WT, label: term.values[WT].label, value: WT }
-	const WTtvs = { type: 'tvs', tvs: { term, values: [WTvalue] } }
-	WTfilter.active = getWrappedTvslst([WTtvs])
-	let WTname = 'Wildtype'
-	// mutated filter
-	const MUTfilter = structuredClone(dtFilter)
-	MUTfilter.group = 1
-	const classes = Object.keys(term.values)
-	if (classes.length < 2) throw 'should have at least 2 classes'
-	let MUTtvs, MUTname
-	if (classes.length == 2) {
-		// only 2 classes
-		// mutant filter will filter for the mutant class
-		const MUT = classes.find(c => c != WT)
-		const MUTvalue = { key: MUT, label: term.values[MUT].label, value: MUT }
-		MUTtvs = { type: 'tvs', tvs: { term, values: [MUTvalue] } }
-		MUTname = term.values[MUT].label
-	} else {
-		// more than 2 classes
-		// mutant filter will filter for all non-wildtype classes
-		MUTtvs = { type: 'tvs', tvs: { term, values: [WTvalue], isnot: true } }
-		MUTname = term.name_noOrigin
-	}
-	MUTfilter.active = getWrappedTvslst([MUTtvs])
-	// excluded filter
-	const EXCLUDEfilter = structuredClone(dtFilter)
-	EXCLUDEfilter.group = 0
-	EXCLUDEfilter.active = getWrappedTvslst()
-	// assign filters to groups
-	let GRPSETname = `${MUTname} vs. Wildtype`
-	if (term.origin) GRPSETname += ` (${term.origin})`
-	const WTgroup = {
-		name: WTname,
-		type: 'filter',
-		uncomputable: false,
-		filter: WTfilter
-	}
-	const MUTgroup = {
-		name: MUTname,
-		type: 'filter',
-		uncomputable: false,
-		filter: MUTfilter
-	}
-	const EXCLUDEgroup = {
-		name: 'Excluded categories',
-		type: 'filter',
-		uncomputable: true,
-		filter: EXCLUDEfilter
-	}
-	// assign groups to groupset
-	const groupset = {
-		name: GRPSETname,
-		groups: [EXCLUDEgroup, MUTgroup, WTgroup],
-		id: term.id
-	}
-	groupsetLst.push(groupset)
-}
-
-export const geneVariantTermGroupsetting = {
-	disabled: false, // as const, // TODO: may need to add is when converting common.js to .ts
-	type: 'custom',
-	lst: groupsetLst
-}
-
 export const colorScaleMap = {
 	blueWhiteRed: { domain: [0, 0.5, 1], range: ['blue', 'white', 'red'] },
 	greenWhiteRed: { domain: [0, 0.5, 1], range: ['green', 'white', 'red'] },

package/src/terms.js

@@ -210,6 +210,13 @@ export function termType2label(type) {
 	return typeMap[type] || 'Unknown term type'
 }
 
+export function getDateFromNumber(value) {
+	const year = Math.floor(value)
+	const time = (value - year) * 365 * 24 * 60 * 60 * 1000 // convert to milliseconds
+	const january1st = new Date(year, 0, 0)
+	const date = new Date(january1st.getTime() + time)
+	return date
+}
 /*
 Value is a decimal year.
 A decimal year is a way of expressing a date or time period as a year with a decimal part, where the decimal portion 
@@ -243,3 +250,12 @@ export function getNumberFromDateStr(str) {
 	const decimal = roundValueAuto(diffDays / 365)
 	return year + decimal
 }
+
+export function getNumberFromDate(date) {
+	const year = date.getFullYear()
+	const january1st = new Date(year, 0, 0)
+	const diffTime = date - january1st
+	const diffDays = Math.floor(diffTime / (1000 * 60 * 60 * 24))
+	const decimal = roundValueAuto(diffDays / 365)
+	return year + decimal
+}