@sjcrh/proteinpaint-server 2.43.1 → 2.43.3-0

package/shared/common.js

@@ -1061,13 +1061,19 @@ export const schemeCategory20 = [
 export const schemeCategory2 = ['#e75480', 'blue']
 
 export function getColorScheme(number) {
+	if (number > 20) {
+		const scheme = []
+		for (let i = 0; i < number; i++) scheme.push(d3.interpolateRainbow(i / number))
+		return scheme
+	}
 	if (number > 12) return schemeCategory20
 	else if (number > 8) return d3.schemePaired
 	else if (number > 2) return d3.schemeDark2
 	else return schemeCategory2
 }
 export function getColors(number) {
-	return d3scale.scaleOrdinal(getColorScheme(number))
+	const scheme = getColorScheme(number)
+	return d3scale.scaleOrdinal(scheme)
 }
 
 export const truncatingMutations = ['F', 'N', 'D', 'I', 'L']

package/src/serverconfig.js

@@ -173,11 +173,17 @@ if (process.env.PP_MODE?.startsWith('container')) {
 }
 
 if (!serverconfig.features) {
-	// default to having an empty object value for
-	// examples of end-user-accessible features are:
-	// mdjsonform: true, healthcheck_keys: ["w", "rs"], etc.
+	/*
+	default to having an empty object value for end-user-accessible features
+	necessary to ensure features{} object is set, as later when bootstraping a dataset, ds.serverconfigFeatures{} will be copied over
+	NOTE  serverconfig.json settings takes highest priority!! these are instance-level setting, e.g. on your dev computer
+	and overwrites default values from ds.serverconfigFeatures{} to assist e.g. dev work
+	*/
 	serverconfig.features = {}
 }
+
+// when a mandatory setting is not defined in any ds, declare its default here
+
 if (process.argv.find(a => a == 'validate')) {
 	// issues in the GDC API (like its servers being under maintenance) should not affect
 	// the ability of the PP server to launch itself, so skip GDC-caching during validation
@@ -210,5 +216,4 @@ if (fs.existsSync('./package.json')) {
 	serverconfig.version = JSON.parse(pkg).version
 }
 
-//Object.freeze(serverconfig)
 module.exports = serverconfig